update

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c06df53b35e3284a99aa042e105f8ac6ca930d9..667002b8fa406ef26186f952e5845a6d9ece29c2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,12 +8,13 @@ SET(prj_NAME FrontAlgorithms)
 SET(prj_MAJOR_VERSION   0)
 SET(prj_MINOR_VERSION   1)
 SET(prj_RELEASE_VERSION 0)
+SET(_subdirs lib plugins)
+SET(_policies CMP0015 CMP0020 CMP0042)
 
 ## ==========================
 ## == Some useful policies ==
 ## ==========================
 
-SET(_policies CMP0015 CMP0020 CMP0042)
 FOREACH(_p ${_policies})
   IF(POLICY ${_p})
     CMAKE_POLICY(SET ${_p} NEW)
@@ -46,7 +47,7 @@ IF(USE_cpPlugins)
   FIND_PACKAGE(cpPlugins)
   MARK_AS_ADVANCED(CLEAR cpPlugins_DIR)
 ENDIF(USE_cpPlugins)
-INCLUDE(cmake/Restrictions.cmake)
+INCLUDE(cmake/BaseConfig.cmake)
 INCLUDE(cmake/KitwareTools.cmake)
 INCLUDE(cmake/QtTools.cmake)
 INCLUDE(cmake/Functions.cmake)
@@ -55,6 +56,8 @@ INCLUDE(cmake/Functions.cmake)
 ## == Build different parts ==
 ## ===========================
 
-SUBDIRS(appli lib plugins)
+FOREACH(_s ${_subdirs})
+  SUBDIRS(${_s})
+ENDFOREACH(_s)
 
 ## eof - $RCSfile$

diff --git a/cmake/BaseConfig.cmake b/cmake/BaseConfig.cmake
new file mode 100644 (file)
index 0000000..d177604
--- /dev/null
+++ b/cmake/BaseConfig.cmake
@@ -0,0 +1,51 @@
+## =======================================================================
+## == Force c++11 language version                                      ==
+## == NOTE: It seems that by default on Visual Studio Compiler supports ==
+## ==       c++11, so it only need to be tested on other OS.            ==
+## =======================================================================
+
+IF(NOT MSVC)
+  INCLUDE(CheckCXXCompilerFlag)
+  CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+  IF(COMPILER_SUPPORTS_CXX11)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  ELSE(COMPILER_SUPPORTS_CXX11)
+    CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+    IF(COMPILER_SUPPORTS_CXX0X)
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    ELSE(COMPILER_SUPPORTS_CXX0X)
+      MESSAGE(
+        FATAL_ERROR
+        "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support."
+        )
+    ENDIF(COMPILER_SUPPORTS_CXX0X)
+  ENDIF(COMPILER_SUPPORTS_CXX11)
+ENDIF(NOT MSVC)
+
+## ===================================================
+## == Prepare header generator to build shared libs ==
+## ===================================================
+
+INCLUDE(GenerateExportHeader)
+
+## ==================================================
+## == Do not allow to build inside the source tree ==
+## ==================================================
+
+IF(PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
+  MESSAGE(FATAL_ERROR "Building in the source tree is not allowed.")
+ENDIF(PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
+
+## =================================================
+## == Where to put targets (executables and libs) ==
+## =================================================
+
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+MARK_AS_ADVANCED(
+  CMAKE_BACKWARDS_COMPATIBILITY
+  EXECUTABLE_OUTPUT_PATH
+  LIBRARY_OUTPUT_PATH
+  )
+
+## eof - $RCSfile$

diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 91f026a7d5334c5798684ea40fc86d71b1e53b94..d7555872cda546b799c5ee0a9e418b3bb48252a4 100644 (file)
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -60,7 +60,7 @@ ENDFUNCTION()
 ## -------------------------------------------------------------------------
 FUNCTION(
   PrepareSourceFiles
-  out_lib_name
+  lib_name
   out_sources_list
   out_headers_list
   out_headers_paths
@@ -176,7 +176,7 @@ FOREACH(_i ${_instances})
   GET_FILENAME_COMPONENT(_out_name ${_i} NAME_WE)
 
   ## -- Infere source code filenames
-  MATH(EXPR _last_range "${cpPlugins_CONFIG_NUMBER_OF_FILES}-1")
+  MATH(EXPR _last_range "${cpPlugins_NUMBER_OF_FILES}-1")
   SET(_out_code)
   FOREACH(_n RANGE 0 ${_last_range})
     LIST(APPEND _out_code ${_i_path}/${_out_name}_${_n}.cxx)
@@ -188,7 +188,7 @@ FOREACH(_i ${_instances})
     OUTPUT ${_out_code}
     DEPENDS ${cpPlugins_bash_CreateInstances_APP} ${_i}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${_i_path}
-    COMMAND ${cpPlugins_bash_CreateInstances_APP} ${_i} ${out_lib_name} ${_i_path}/${_out_name}
+    COMMAND ${cpPlugins_bash_CreateInstances_APP} ${_i} ${lib_name} ${_i_path}/${_out_name}
     )
 ENDFOREACH(_i)
 
@@ -209,18 +209,29 @@ SET(${out_headers_paths} ${_hdrs_paths} PARENT_SCOPE)
 ENDFUNCTION()
 
 ## -------------------------------------------------------------------------
-FUNCTION(
-  CreateLib
-  lib_name
-  lib_type
-  )
-PrepareSourceFiles(${lib_name} _srcs _hdrs _paths ${ARGN})
-INCLUDE_DIRECTORIES(
-  ${_paths}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  )
+FUNCTION(cpPlugins_BuildLibrary lib_name lib_type)
+# -- Detect all source files
+SET(_all_files)
+FOREACH(_c ${ARGN})
+  GET_FILENAME_COMPONENT(_cname ${_c} ABSOLUTE)
+  SET(_files)
+  IF(IS_DIRECTORY ${_cname})
+    FILE(GLOB_RECURSE _files "${_cname}/*")
+  ELSE(IS_DIRECTORY ${_cname})
+    SET(_files ${_cname})
+  ENDIF(IS_DIRECTORY ${_cname})
+  LIST(APPEND _all_files ${_files})
+ENDFOREACH(_c ${ARGN})
+
+## -- Prepare sources by types
+PrepareSourceFiles(${lib_name} _srcs _hdrs _paths ${_all_files})
+
+## -- Build library
 IF(_srcs)
+  INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    )
   ADD_LIBRARY(${lib_name} ${lib_type} ${_srcs} ${_hdrs})
   GENERATE_EXPORT_HEADER(
     ${lib_name}
@@ -229,82 +240,80 @@ IF(_srcs)
     EXPORT_FILE_NAME ${lib_name}_Export.h
     STATIC_DEFINE ${lib_name}_BUILT_AS_STATIC
     )
-  IF(${prj_NAME}_All_Headers)
-    SET(_hdr_tmp "${${prj_NAME}_All_Headers};${_hdrs}")
-  ELSE(${prj_NAME}_All_Headers)
-    SET(_hdr_tmp "${_hdrs}")
-  ENDIF(${prj_NAME}_All_Headers)
-  LIST(REMOVE_DUPLICATES _hdr_tmp)
-  SET(${prj_NAME}_All_Headers ${_hdr_tmp} CACHE INTERNAL "All headers." FORCE)
 ENDIF(_srcs)
-ENDFUNCTION()
 
-## -------------------------------------------------------------------------
-FUNCTION(
-  CompileLibFromDir
-  lib_name
-  lib_type
-  lib_dir
-  )
-FILE(GLOB_RECURSE _files "${lib_dir}/*")
-CreateLib(${lib_name} ${lib_type} ${_files} ${ARGN})
 ENDFUNCTION()
 
 ## -------------------------------------------------------------------------
-FUNCTION(
-  CreatePlugin
-  lib_name
-  lib_dir
-  )
-GET_FILENAME_COMPONENT(_lib_dir ${lib_dir} REALPATH)
-FILE(GLOB_RECURSE _files "${_lib_dir}/*")
-SET(_hdr_to_wrap)
-FOREACH(_file ${_files})
-  FILE(READ ${_file} _txt)
-  STRING(FIND "${_txt}" "cpPluginsObject" _res)
-  IF(NOT ${_res} EQUAL -1)
-    LIST(APPEND _hdr_to_wrap ${_file})
-  ENDIF(NOT ${_res} EQUAL -1)
-ENDFOREACH(_file)
+FUNCTION(cpPlugins_BuildPluginsLibrary lib_name)
+# -- Detect all source files
+SET(_all_files)
+FOREACH(_c ${ARGN})
+  GET_FILENAME_COMPONENT(_cname ${_c} ABSOLUTE)
+  SET(_files)
+  IF(IS_DIRECTORY ${_cname})
+    FILE(GLOB_RECURSE _files "${_cname}/*")
+  ELSE(IS_DIRECTORY ${_cname})
+    SET(_files ${_cname})
+  ENDIF(IS_DIRECTORY ${_cname})
+  LIST(APPEND _all_files ${_files})
+ENDFOREACH(_c ${ARGN})
 
-IF(_hdr_to_wrap)
-  STRING(
-    REPLACE
-    ${PROJECT_SOURCE_DIR}
-    ${PROJECT_BINARY_DIR}
-    _out_dir
-    ${_lib_dir}
-    )
-  SET(_host ${_out_dir}/${lib_name}_host.cxx)
+## -- Prepare sources by types
+PrepareSourceFiles(${lib_name} _srcs _hdrs _paths ${_all_files})
+
+## -- Check which headers need to be wrapped to build host code
+SET(_hdrs_to_wrap)
+FOREACH(_hdr ${_hdrs})
+  IF(EXISTS ${_hdr})
+    FILE(READ ${_hdr} _txt)
+    STRING(FIND "${_txt}" "cpPluginsObject" _res)
+    IF(NOT ${_res} EQUAL -1)
+      LIST(APPEND _hdrs_to_wrap ${_hdr})
+    ENDIF(NOT ${_res} EQUAL -1)
+  ENDIF(EXISTS ${_hdr})
+ENDFOREACH(_hdr)
+
+## -- Wrap headers
+IF(_hdrs_to_wrap)
+  SET(_host ${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_host.cxx)
   ADD_CUSTOM_COMMAND(
     OUTPUT ${_host}
-    DEPENDS ${cpPlugins_bash_HostCreator_APP} ${_hdr_to_wrap}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${_out_dir}
-    COMMAND ${cpPlugins_bash_HostCreator_APP} ${lib_name} ${_host} ${_hdr_to_wrap}
+    DEPENDS ${cpPlugins_bash_HostCreator_APP} ${_hdrs_to_wrap}
+    COMMAND ${cpPlugins_bash_HostCreator_APP} ${lib_name} ${_host} ${_hdrs_to_wrap}
     )
-  LIST(APPEND _files ${_host})
-ENDIF(_hdr_to_wrap)
-
-CreateLib(${lib_name} SHARED ${_files})
+  LIST(APPEND _all_files ${_host})
+ENDIF(_hdrs_to_wrap)
 
+cpPlugins_BuildLibrary(${lib_name} SHARED ${_all_files})
 ENDFUNCTION()
 
 ## -------------------------------------------------------------------------
-FUNCTION(
-  CompileAppFromDir
-  app_name
-  app_dir
-  )
-OPTION(BUILD_${app_name} "Build ${app_name}" OFF)
+FUNCTION(cpPlugins_BuildApplication app_name)
+OPTION(BUILD_${app_name} "Build \"${app_name}\" application?" OFF)
 IF(BUILD_${app_name})
-  FILE(GLOB_RECURSE _files "${app_dir}/*")
-  PrepareSourceFiles(${app_name} _srcs _hdrs _paths ${_files} ${ARGN})
-  INCLUDE_DIRECTORIES(
-    ${_paths}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    )
+  # -- Detect all source files
+  SET(_all_files)
+  FOREACH(_c ${ARGN})
+    GET_FILENAME_COMPONENT(_cname ${_c} ABSOLUTE)
+    SET(_files)
+    IF(IS_DIRECTORY ${_cname})
+      FILE(GLOB_RECURSE _files "${_cname}/*")
+    ELSE(IS_DIRECTORY ${_cname})
+      SET(_files ${_cname})
+    ENDIF(IS_DIRECTORY ${_cname})
+    LIST(APPEND _all_files ${_files})
+  ENDFOREACH(_c ${ARGN})
+
+  ## -- Prepare sources by types
+  PrepareSourceFiles(${app_name} _srcs _hdrs _paths ${_all_files})
+
+  ## -- Build library
   IF(_srcs)
+    INCLUDE_DIRECTORIES(
+      ${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_BINARY_DIR}
+      )
     SET(_app_os_target)
     IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
       SET(_app_os_target WIN32)

diff --git a/cmake/QtTools.cmake b/cmake/QtTools.cmake
index a3b496650a57a84ac88f79ca75b14e0abadd1eef..3ec2889898c7f4715b277a99827855d45a66cfb7 100644 (file)
--- a/cmake/QtTools.cmake
+++ b/cmake/QtTools.cmake
@@ -2,8 +2,7 @@
 ## == Find Qt4 and check if it was well configured ==
 ## ==================================================
 
-IF(USE_QT4)
-  SET(QT4_FOUND "0")
+## IF(BUILD_QT4_COMPONENTS)
   FIND_PACKAGE(Qt4 REQUIRED)
   INCLUDE(${QT_USE_FILE})
   SET(
@@ -16,13 +15,14 @@ IF(USE_QT4)
       BREAK()
     ENDIF(NOT ${_m}_LOADED)
   ENDFOREACH(_m)
-  SET(QT4_FOUND "1")
   SET(
     cpPlugins_Qt4_VTKWidget
     QVTKWidget
     CACHE STRING "Base Qt4-based vtkRenderWindow"
     )
-  MARK_AS_ADVANCED(FORCE cpPlugins_Qt4_VTKWidget)
-ENDIF(USE_QT4)
+  # ADD_DEFINITIONS(-DcpPlugins_QT4 -DcpExtensions_QT4)
+## ELSE(BUILD_QT4_COMPONENTS)
+  # ADD_DEFINITIONS(-UcpPlugins_QT4 -UcpExtensions_QT4)
+## ENDIF(BUILD_QT4_COMPONENTS)
 
 ## eof - $RCSfile$

diff --git a/lib/fpaInstances/CMakeLists.txt b/lib/fpaInstances/CMakeLists.txt
index e20f9198da46f6de273d5fe7e3eab57eb339aa7f..dc320c77dedd5d307268c5ba9aa6cedd7c867206 100644 (file)
--- a/lib/fpaInstances/CMakeLists.txt
+++ b/lib/fpaInstances/CMakeLists.txt
@@ -8,8 +8,8 @@ INCLUDE_DIRECTORIES(
   )
 SET(_pfx fpaInstaces)
 
-CreateLib(${_pfx}DataObjects SHARED ${CMAKE_CURRENT_SOURCE_DIR}/DataObjects.i)
-CreateLib(${_pfx}Filters SHARED ${CMAKE_CURRENT_SOURCE_DIR}/Filters.i)
+cpPlugins_BuildLibrary(${_pfx}DataObjects SHARED ${CMAKE_CURRENT_SOURCE_DIR}/DataObjects.i)
+cpPlugins_BuildLibrary(${_pfx}Filters SHARED ${CMAKE_CURRENT_SOURCE_DIR}/Filters.i)
 
 TARGET_LINK_LIBRARIES(${_pfx}DataObjects ${cpPlugins_AllInstances})
 TARGET_LINK_LIBRARIES(${_pfx}Filters ${_pfx}DataObjects)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 9e419ed498ffd677d06750756f8968ffc2a3eb66..3f7acfeec58e80ea25aefef8ea30beadc5403222 100644 (file)
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -22,7 +22,7 @@ IF(USE_cpPlugins)
   ENDIF(BUILD_ExperimentationPlugins)
 
   FOREACH(_d ${_dirs})
-    CreatePlugin(
+    cpPlugins_BuildPluginsLibrary(
       fpaPlugins${_d} ${CMAKE_CURRENT_SOURCE_DIR}/${_d}
       )
     TARGET_LINK_LIBRARIES(

diff --git a/plugins/DijkstraFunctors/ExtractPathFromMinimumSpanningTree.cxx b/plugins/DijkstraFunctors/ExtractPathFromMinimumSpanningTree.cxx
index e41c26409ecc54f13f90a383573db0cf17d2085d..76ce6b8b3cd9cae956f06a2ab46aba46b70e048f 100644 (file)
--- a/plugins/DijkstraFunctors/ExtractPathFromMinimumSpanningTree.cxx
+++ b/plugins/DijkstraFunctors/ExtractPathFromMinimumSpanningTree.cxx
@@ -1,6 +1,6 @@
 #include <DijkstraFunctors/ExtractPathFromMinimumSpanningTree.h>
-#include <cpInstances/Image.h>
-#include <cpInstances/PolyLineParametricPath.h>
+#include <cpInstances/DataObjects/Image.h>
+#include <cpInstances/DataObjects/PolyLineParametricPath.h>
 #include <vtkPolyData.h>
 #include <fpa/Image/MinimumSpanningTree.h>
 
@@ -9,8 +9,8 @@ fpaPluginsDijkstraFunctors::ExtractPathFromMinimumSpanningTree::
 ExtractPathFromMinimumSpanningTree( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject             _TData;
-  typedef cpInstances::Image                  _TMST;
+  typedef cpPlugins::Pipeline::DataObject             _TData;
+  typedef cpInstances::DataObjects::Image                  _TMST;
   typedef cpInstances::PolyLineParametricPath _TPath;
 
   this->_ConfigureInput< _TMST >( "MST", true, false );

diff --git a/plugins/DijkstraFunctors/ExtractPathFromMinimumSpanningTree.h b/plugins/DijkstraFunctors/ExtractPathFromMinimumSpanningTree.h
index 4e4b386c7bec43cd1c93f4b6aeaadb3840d83172..f98e959fe4d1413d502f1deeb7a3736e7e2ef476 100644 (file)
--- a/plugins/DijkstraFunctors/ExtractPathFromMinimumSpanningTree.h
+++ b/plugins/DijkstraFunctors/ExtractPathFromMinimumSpanningTree.h
@@ -2,18 +2,18 @@
 #define __fpaPluginsDijkstraFunctors__ExtractPathFromMinimumSpanningTree__h__
 
 #include <fpaPluginsDijkstraFunctors_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
 
 namespace fpaPluginsDijkstraFunctors
 {
   /**
    */
   class fpaPluginsDijkstraFunctors_EXPORT ExtractPathFromMinimumSpanningTree
-    : public cpPlugins::BaseObjects::ProcessObject
+    : public cpPlugins::Pipeline::ProcessObject
   {
     cpPluginsObject(
       ExtractPathFromMinimumSpanningTree,
-      cpPlugins::BaseObjects::ProcessObject,
+      cpPlugins::Pipeline::ProcessObject,
       fpaDijkstraFunctors
       );
 

diff --git a/plugins/DijkstraFunctors/GaussianModelCost.cxx b/plugins/DijkstraFunctors/GaussianModelCost.cxx
index 8d796ee5ee4fe26884e564741f86c0b53fc8c029..0b62621fc2da43b57c2c5505e773b243064d859f 100644 (file)
--- a/plugins/DijkstraFunctors/GaussianModelCost.cxx
+++ b/plugins/DijkstraFunctors/GaussianModelCost.cxx
@@ -1,5 +1,5 @@
 #include <DijkstraFunctors/GaussianModelCost.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 
 #include <fpa/Base/Functors/GaussianModel.h>
 
@@ -8,7 +8,7 @@ fpaPluginsDijkstraFunctors::GaussianModelCost::
 GaussianModelCost( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject _TData;
+  typedef cpPlugins::Pipeline::DataObject _TData;
   this->_ConfigureOutput< _TData >( "Output" );
 
   std::vector< std::string > choices;

diff --git a/plugins/DijkstraFunctors/GaussianModelCost.h b/plugins/DijkstraFunctors/GaussianModelCost.h
index cab177d98fc95cdb972ad7bedf1d7c24e3634b58..8a204abae94cccbddb9b9e4761b05facc27598a9 100644 (file)
--- a/plugins/DijkstraFunctors/GaussianModelCost.h
+++ b/plugins/DijkstraFunctors/GaussianModelCost.h
@@ -2,18 +2,18 @@
 #define __fpa__Plugins__GaussianModelCost__h__
 
 #include <fpaPluginsDijkstraFunctors_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
 
 namespace fpaPluginsDijkstraFunctors
 {
   /**
    */
   class fpaPluginsDijkstraFunctors_EXPORT GaussianModelCost
-    : public cpPlugins::BaseObjects::ProcessObject
+    : public cpPlugins::Pipeline::ProcessObject
   {
     cpPluginsObject(
       GaussianModelCost,
-      cpPlugins::BaseObjects::ProcessObject,
+      cpPlugins::Pipeline::ProcessObject,
       fpaDijkstraFunctors
       );
 

diff --git a/plugins/DijkstraFunctors/InvertCost.cxx b/plugins/DijkstraFunctors/InvertCost.cxx
index be8e8f9a4d0a45f72a7b00fc4482716a029b84d1..f5a13382dade691dce0db5d913789d1800dc4563 100644 (file)
--- a/plugins/DijkstraFunctors/InvertCost.cxx
+++ b/plugins/DijkstraFunctors/InvertCost.cxx
@@ -1,5 +1,5 @@
 #include <DijkstraFunctors/InvertCost.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 
 #include <fpa/Base/Functors/Inverse.h>
 
@@ -8,7 +8,7 @@ fpaPluginsDijkstraFunctors::InvertCost::
 InvertCost( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject _TData;
+  typedef cpPlugins::Pipeline::DataObject _TData;
   this->_ConfigureOutput< _TData >( "Output" );
 
   std::vector< std::string > choices;

diff --git a/plugins/DijkstraFunctors/InvertCost.h b/plugins/DijkstraFunctors/InvertCost.h
index 7788d78e0e40af4146db0b41279b1fa364725143..c45c732a5ddf5a8c7f66c3ab8ff51353b902b2cf 100644 (file)
--- a/plugins/DijkstraFunctors/InvertCost.h
+++ b/plugins/DijkstraFunctors/InvertCost.h
@@ -2,18 +2,18 @@
 #define __fpa__Plugins__InvertCost__h__
 
 #include <fpaPluginsDijkstraFunctors_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
 
 namespace fpaPluginsDijkstraFunctors
 {
   /**
    */
   class fpaPluginsDijkstraFunctors_EXPORT InvertCost
-    : public cpPlugins::BaseObjects::ProcessObject
+    : public cpPlugins::Pipeline::ProcessObject
   {
     cpPluginsObject(
       InvertCost,
-      cpPlugins::BaseObjects::ProcessObject,
+      cpPlugins::Pipeline::ProcessObject,
       fpaDijkstraFunctors
       );
 

diff --git a/plugins/DijkstraFunctors/SimpleImageDijkstraCost.cxx b/plugins/DijkstraFunctors/SimpleImageDijkstraCost.cxx
index e825a162f3a376db37cdd170f98a89b5ea1f0a89..e19327a9d88951361cefd527c3c345fb0cb9a73d 100644 (file)
--- a/plugins/DijkstraFunctors/SimpleImageDijkstraCost.cxx
+++ b/plugins/DijkstraFunctors/SimpleImageDijkstraCost.cxx
@@ -1,5 +1,5 @@
 #include <DijkstraFunctors/SimpleImageDijkstraCost.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 
 #include <itkImage.h>
 #include <fpa/Image/Functors/SimpleDijkstraCost.h>
@@ -9,8 +9,8 @@ fpaPluginsDijkstraFunctors::SimpleImageDijkstraCost::
 SimpleImageDijkstraCost( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject _TData;
-  typedef cpInstances::Image _TImage;
+  typedef cpPlugins::Pipeline::DataObject _TData;
+  typedef cpInstances::DataObjects::Image _TImage;
 
   this->_ConfigureInput< _TImage >( "Input", true, false );
   this->_ConfigureOutput< _TData >( "Output" );

diff --git a/plugins/DijkstraFunctors/SimpleImageDijkstraCost.h b/plugins/DijkstraFunctors/SimpleImageDijkstraCost.h
index 64fa18c6255a38ce7886d31e794d074fb63ec383..e1ff8e4e62bc37de1ac51a6b620996dc4ad84a31 100644 (file)
--- a/plugins/DijkstraFunctors/SimpleImageDijkstraCost.h
+++ b/plugins/DijkstraFunctors/SimpleImageDijkstraCost.h
@@ -2,18 +2,18 @@
 #define __fpa__Plugins__SimpleImageDijkstraCost__h__
 
 #include <fpaPluginsDijkstraFunctors_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
 
 namespace fpaPluginsDijkstraFunctors
 {
   /**
    */
   class fpaPluginsDijkstraFunctors_EXPORT SimpleImageDijkstraCost
-    : public cpPlugins::BaseObjects::ProcessObject
+    : public cpPlugins::Pipeline::ProcessObject
   {
     cpPluginsObject(
       SimpleImageDijkstraCost,
-      cpPlugins::BaseObjects::ProcessObject,
+      cpPlugins::Pipeline::ProcessObject,
       fpaDijkstraFunctors
       );
 

diff --git a/plugins/Experiments/InsertNoiseIntoPoints.cxx b/plugins/Experiments/InsertNoiseIntoPoints.cxx
index 403231662307a9aa06c194ce1a724f57441f918b..e21f37bce29d94787cfa2638c72da440040ef9e4 100644 (file)
--- a/plugins/Experiments/InsertNoiseIntoPoints.cxx
+++ b/plugins/Experiments/InsertNoiseIntoPoints.cxx
@@ -1,5 +1,5 @@
 #include <Experiments/InsertNoiseIntoPoints.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 #include <cpInstances/Mesh.h>
 
 #include <random>
@@ -11,7 +11,7 @@ fpaPluginsExperiments::InsertNoiseIntoPoints::
 InsertNoiseIntoPoints( )
   : Superclass( )
 {
-  typedef cpInstances::Image _TImage;
+  typedef cpInstances::DataObjects::Image _TImage;
   typedef cpInstances::Mesh  _TMesh;
 
   this->_ConfigureInput< _TMesh >( "Seeds", true, false );

diff --git a/plugins/Experiments/InsertNoiseIntoPoints.h b/plugins/Experiments/InsertNoiseIntoPoints.h
index e7fd10f90bbfed90e8b3fbf59bb38fe1a9b17cde..2b33086757026c2a9ae54a4178069c078c8333fa 100644 (file)
--- a/plugins/Experiments/InsertNoiseIntoPoints.h
+++ b/plugins/Experiments/InsertNoiseIntoPoints.h
@@ -2,18 +2,18 @@
 #define __fpaPluginsExperiments__InsertNoiseIntoPoints__h__
 
 #include <fpaPluginsExperiments_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
 
 namespace fpaPluginsExperiments
 {
   /**
    */
   class fpaPluginsExperiments_EXPORT InsertNoiseIntoPoints
-    : public cpPlugins::BaseObjects::ProcessObject
+    : public cpPlugins::Pipeline::ProcessObject
   {
     cpPluginsObject(
       InsertNoiseIntoPoints,
-      cpPlugins::BaseObjects::ProcessObject,
+      cpPlugins::Pipeline::ProcessObject,
       fpaExperiments
       );
   };

diff --git a/plugins/Experiments/SkeletonHausdorffDistance.cxx b/plugins/Experiments/SkeletonHausdorffDistance.cxx
index 9f5a4dcf5554751dcf1d92c5ca0d2103eb3faf8e..82401329d8a731db51f5f09e50110dfeee7072ee 100644 (file)
--- a/plugins/Experiments/SkeletonHausdorffDistance.cxx
+++ b/plugins/Experiments/SkeletonHausdorffDistance.cxx
@@ -1,7 +1,7 @@
 #include <Experiments/SkeletonHausdorffDistance.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 #include <cpInstances/Mesh.h>
-#include <cpInstances/Skeleton.h>
+#include <cpInstances/DataObjects/Skeleton.h>
 #include <cpExtensions/DataStructures/Skeleton.h>
 
 #include <vtkImageData.h>
@@ -12,7 +12,7 @@ fpaPluginsExperiments::SkeletonHausdorffDistance::
 SkeletonHausdorffDistance( )
   : Superclass( )
 {
-  this->_ConfigureInput< cpInstances::Image >( "DistanceMap", true, false );
+  this->_ConfigureInput< cpInstances::DataObjects::Image >( "DistanceMap", true, false );
   this->_ConfigureInput< cpInstances::Mesh >( "Seeds", true, false );
   this->_ConfigureInput< cpInstances::Skeleton >( "Skeleton1", true, false );
   this->_ConfigureInput< cpInstances::Skeleton >( "Skeleton2", true, false );

diff --git a/plugins/Experiments/SkeletonHausdorffDistance.h b/plugins/Experiments/SkeletonHausdorffDistance.h
index ae4ef80f3b72e589e274d2795b5d2004a9cfe3be..7ac8820b9785a4e56b15404cb37074cb6d9836ec 100644 (file)
--- a/plugins/Experiments/SkeletonHausdorffDistance.h
+++ b/plugins/Experiments/SkeletonHausdorffDistance.h
@@ -2,18 +2,18 @@
 #define __fpaPluginsExperiments__SkeletonHausdorffDistance__h__
 
 #include <fpaPluginsExperiments_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
 
 namespace fpaPluginsExperiments
 {
   /**
    */
   class fpaPluginsExperiments_EXPORT SkeletonHausdorffDistance
-    : public cpPlugins::BaseObjects::ProcessObject
+    : public cpPlugins::Pipeline::ProcessObject
   {
     cpPluginsObject(
       SkeletonHausdorffDistance,
-      cpPlugins::BaseObjects::ProcessObject,
+      cpPlugins::Pipeline::ProcessObject,
       fpaExperiments
       );
 

diff --git a/plugins/ImageAlgorithms/BaseFilter.cxx b/plugins/ImageAlgorithms/BaseFilter.cxx
index da278a7167d28c9739b3b18a767ebb19ea42c53b..ae7c6c3c84db4805fa50b29bacd5deb4850dfec2 100644 (file)
--- a/plugins/ImageAlgorithms/BaseFilter.cxx
+++ b/plugins/ImageAlgorithms/BaseFilter.cxx
@@ -1,13 +1,13 @@
 #include <ImageAlgorithms/BaseFilter.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 
 // -------------------------------------------------------------------------
 fpaPluginsImageAlgorithms::BaseFilter::
 BaseFilter( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject _TData;
-  typedef cpInstances::Image _TImage;
+  typedef cpPlugins::Pipeline::DataObject _TData;
+  typedef cpInstances::DataObjects::Image _TImage;
 
   this->_ConfigureInput< _TImage >( "Input", true, false );
   this->_ConfigureInput< _TData >( "Seeds", true, false );

diff --git a/plugins/ImageAlgorithms/BaseFilter.h b/plugins/ImageAlgorithms/BaseFilter.h
index 9808e46225099bc1a09435305c3696b2a273385e..256888161cb38796656e05276548e2537a7ea411 100644 (file)
--- a/plugins/ImageAlgorithms/BaseFilter.h
+++ b/plugins/ImageAlgorithms/BaseFilter.h
@@ -2,7 +2,7 @@
 #define __fpaPluginsImageAlgorithms__BaseFilter__h__
 
 #include <fpaPluginsImageAlgorithms_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
 #include <vtkPolyData.h>
 #include <fpa/Image/Functors/SimpleNeighborhood.h>
 
@@ -11,16 +11,16 @@ namespace fpaPluginsImageAlgorithms
   /**
    */
   class fpaPluginsImageAlgorithms_EXPORT BaseFilter
-    : public cpPlugins::BaseObjects::ProcessObject
+    : public cpPlugins::Pipeline::ProcessObject
   {
   public:
     typedef BaseFilter                            Self;
-    typedef cpPlugins::BaseObjects::ProcessObject Superclass;
+    typedef cpPlugins::Pipeline::ProcessObject Superclass;
     typedef itk::SmartPointer< Self >             Pointer;
     typedef itk::SmartPointer< const Self >       ConstPointer;
 
   public:
-    itkTypeMacro( BaseFilter, cpPlugins::BaseObjects::ProcessObject );
+    itkTypeMacro( BaseFilter, cpPlugins::Pipeline::ProcessObject );
     cpPlugins_Id_Macro( BaseFilter, fpaImageAlgorithm );
 
   protected:

diff --git a/plugins/ImageAlgorithms/Dijkstra.cxx b/plugins/ImageAlgorithms/Dijkstra.cxx
index 56be8f1a6590cbd27266a8abcdd1f64934300db8..45f01186721332dc957a6f1079cf326bd610a48f 100644 (file)
--- a/plugins/ImageAlgorithms/Dijkstra.cxx
+++ b/plugins/ImageAlgorithms/Dijkstra.cxx
@@ -1,5 +1,5 @@
 #include <ImageAlgorithms/Dijkstra.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 
 #include <fpa/Image/Dijkstra.h>
 
@@ -8,8 +8,8 @@ fpaPluginsImageAlgorithms::Dijkstra::
 Dijkstra( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject _TData;
-  typedef cpInstances::Image _TMST;
+  typedef cpPlugins::Pipeline::DataObject _TData;
+  typedef cpInstances::DataObjects::Image _TMST;
 
   this->_ConfigureInput< _TData >( "Cost", false, false );
   this->_ConfigureInput< _TData >( "CostConversion", false, false );

diff --git a/plugins/ImageAlgorithms/RegionGrow.cxx b/plugins/ImageAlgorithms/RegionGrow.cxx
index 801c7f002a42045084355d4ffeccfb7acf274f89..bec55ee530f1c332248ff7d8834bcffca51ac53d 100644 (file)
--- a/plugins/ImageAlgorithms/RegionGrow.cxx
+++ b/plugins/ImageAlgorithms/RegionGrow.cxx
@@ -1,5 +1,5 @@
 #include <ImageAlgorithms/RegionGrow.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 
 #include <fpa/Image/RegionGrow.h>
 
@@ -8,7 +8,7 @@ fpaPluginsImageAlgorithms::RegionGrow::
 RegionGrow( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject _TData;
+  typedef cpPlugins::Pipeline::DataObject _TData;
 
   this->_ConfigureInput< _TData >( "GrowFunction", true, false );
   this->m_Parameters.ConfigureAsInt( "InsideValue", 1 );

diff --git a/plugins/ImageAlgorithms/SkeletonFilter.cxx b/plugins/ImageAlgorithms/SkeletonFilter.cxx
index d4d46c19b30cfaa6e8d97a2bf7e227a31fdbf40a..106dab2f819711fd64d123beba91a77bf4c08594 100644 (file)
--- a/plugins/ImageAlgorithms/SkeletonFilter.cxx
+++ b/plugins/ImageAlgorithms/SkeletonFilter.cxx
@@ -1,6 +1,6 @@
 #include <ImageAlgorithms/SkeletonFilter.h>
-#include <cpInstances/Image.h>
-#include <cpInstances/Skeleton.h>
+#include <cpInstances/DataObjects/Image.h>
+#include <cpInstances/DataObjects/Skeleton.h>
 
 #include <fpa/Image/SkeletonFilter.h>
 #include <itkImage.h>
@@ -11,9 +11,9 @@ fpaPluginsImageAlgorithms::SkeletonFilter::
 SkeletonFilter( )
   : Superclass( )
 {
-  typedef cpInstances::Image    _TImage;
+  typedef cpInstances::DataObjects::Image    _TImage;
   typedef cpInstances::Skeleton _TSkeleton;
-  typedef cpPlugins::BaseObjects::DataObject _TData;
+  typedef cpPlugins::Pipeline::DataObject _TData;
 
   this->_ConfigureInput< _TImage >( "Input", true, false );
   this->_ConfigureInput< _TData >( "Seeds", true, false );

diff --git a/plugins/ImageAlgorithms/SkeletonFilter.h b/plugins/ImageAlgorithms/SkeletonFilter.h
index 356b61cd2e6657e100edb3ad2f164c391692bdde..cd3ebcf267e8ca5992babd3eccf486a634b37e80 100644 (file)
--- a/plugins/ImageAlgorithms/SkeletonFilter.h
+++ b/plugins/ImageAlgorithms/SkeletonFilter.h
@@ -2,18 +2,18 @@
 #define __fpaPluginsImageAlgorithms__SkeletonFilter__h__
 
 #include <fpaPluginsImageAlgorithms_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
 
 namespace fpaPluginsImageAlgorithms
 {
   /**
    */
   class fpaPluginsImageAlgorithms_EXPORT SkeletonFilter
-    : public cpPlugins::BaseObjects::ProcessObject
+    : public cpPlugins::Pipeline::ProcessObject
   {
     cpPluginsObject(
       SkeletonFilter,
-      cpPlugins::BaseObjects::ProcessObject,
+      cpPlugins::Pipeline::ProcessObject,
       fpaImageAlgorithms
       );
 

diff --git a/plugins/RegionGrowFunctors/BinaryThreshold.cxx b/plugins/RegionGrowFunctors/BinaryThreshold.cxx
index 68882724a884a5b529177fe5402da189210764d2..9ed2db673500df1c8f59a63c3451f30ae5734aa6 100644 (file)
--- a/plugins/RegionGrowFunctors/BinaryThreshold.cxx
+++ b/plugins/RegionGrowFunctors/BinaryThreshold.cxx
@@ -1,5 +1,5 @@
 #include <RegionGrowFunctors/BinaryThreshold.h>
-#include <cpInstances/Image.h>
+#include <cpInstances/DataObjects/Image.h>
 
 #include <fpa/Image/Functors/RegionGrowBinaryThreshold.h>
 #include <itkConstNeighborhoodIterator.h>
@@ -10,8 +10,8 @@ fpaPluginsRegionGrowFunctors::BinaryThreshold::
 BinaryThreshold( )
   : Superclass( )
 {
-  typedef cpPlugins::BaseObjects::DataObject _TData;
-  typedef cpInstances::Image _TImage;
+  typedef cpPlugins::Pipeline::DataObject _TData;
+  typedef cpInstances::DataObjects::Image _TImage;
 
   this->_ConfigureInput< _TImage >( "Input", true, false );
   this->_ConfigureInput< _TData >( "Seeds", false, false );

diff --git a/plugins/RegionGrowFunctors/BinaryThreshold.h b/plugins/RegionGrowFunctors/BinaryThreshold.h
index 30f9a0e3235ee09524607abae492ec44026c7e5d..cc5a814cd5588f307a28dad7ddd584d2bddca632 100644 (file)
--- a/plugins/RegionGrowFunctors/BinaryThreshold.h
+++ b/plugins/RegionGrowFunctors/BinaryThreshold.h
@@ -2,18 +2,18 @@
 #define __fpaPluginsRegionGrowFunctors__BinaryThreshold__h__
 
 #include <fpaPluginsRegionGrowFunctors_Export.h>
-#include <cpPlugins/BaseObjects/ProcessObject.h>
+#include <cpPlugins/Pipeline/ProcessObject.h>
 
 namespace fpaPluginsRegionGrowFunctors
 {
   /**
    */
   class fpaPluginsRegionGrowFunctors_EXPORT BinaryThreshold
-    : public cpPlugins::BaseObjects::ProcessObject
+    : public cpPlugins::Pipeline::ProcessObject
   {
     cpPluginsObject(
       BinaryThreshold,
-      cpPlugins::BaseObjects::ProcessObject,
+      cpPlugins::Pipeline::ProcessObject,
       fpaRegionGrowFunctors
       );