]> Creatis software - cpPlugins.git/commitdiff
... refactoring
authorLeonardo Florez Valencia <florez-l@javeriana.edu.co>
Thu, 17 Sep 2015 12:33:52 +0000 (14:33 +0200)
committerLeonardo Florez Valencia <florez-l@javeriana.edu.co>
Thu, 17 Sep 2015 12:33:52 +0000 (14:33 +0200)
92 files changed:
appli/ImageMPR/CMakeLists.txt
appli/ImageMPR/ImageMPR.h
appli/examples/CMakeLists.txt
lib/CMakeLists.txt
lib/cpExtensions/Algorithms/BezierCurveFunction.h [moved from lib/cpPlugins/Extensions/Algorithms/BezierCurveFunction.h with 85% similarity]
lib/cpExtensions/Algorithms/BezierCurveFunction.hxx [moved from lib/cpPlugins/Extensions/Algorithms/BezierCurveFunction.hxx with 80% similarity]
lib/cpExtensions/Algorithms/GradientFunctionBase.h [moved from lib/cpPlugins/Extensions/Algorithms/GradientFunctionBase.h with 87% similarity]
lib/cpExtensions/Algorithms/GradientFunctionBase.hxx [moved from lib/cpPlugins/Extensions/Algorithms/GradientFunctionBase.hxx with 68% similarity]
lib/cpExtensions/Algorithms/GulsunTekMedialness.h [moved from lib/cpPlugins/Extensions/Algorithms/GulsunTekMedialness.h with 85% similarity]
lib/cpExtensions/Algorithms/GulsunTekMedialness.hxx [moved from lib/cpPlugins/Extensions/Algorithms/GulsunTekMedialness.hxx with 91% similarity]
lib/cpExtensions/Algorithms/ImageFunctionFilter.h [moved from lib/cpPlugins/Extensions/Algorithms/ImageFunctionFilter.h with 88% similarity]
lib/cpExtensions/Algorithms/ImageFunctorFilter.h [moved from lib/cpPlugins/Extensions/Algorithms/ImageFunctorFilter.h with 90% similarity]
lib/cpExtensions/Algorithms/InertiaMedialness.h [moved from lib/cpPlugins/Extensions/Algorithms/InertiaMedialness.h with 94% similarity]
lib/cpExtensions/Algorithms/InertiaTensorFunction.h [moved from lib/cpPlugins/Extensions/Algorithms/InertiaTensorFunction.h with 93% similarity]
lib/cpExtensions/Algorithms/IsoImageSlicer.h [moved from lib/cpPlugins/Extensions/Algorithms/IsoImageSlicer.h with 95% similarity]
lib/cpExtensions/Algorithms/IsoImageSlicer.hxx [moved from lib/cpPlugins/Extensions/Algorithms/IsoImageSlicer.hxx with 82% similarity]
lib/cpExtensions/Algorithms/IterativeGaussianModelEstimator.h [moved from lib/cpPlugins/Extensions/Algorithms/IterativeGaussianModelEstimator.h with 87% similarity]
lib/cpExtensions/Algorithms/IterativeGaussianModelEstimator.hxx [moved from lib/cpPlugins/Extensions/Algorithms/IterativeGaussianModelEstimator.hxx with 82% similarity]
lib/cpExtensions/Algorithms/KalmanConstantFilter.cxx [moved from lib/cpPlugins/Extensions/Algorithms/KalmanConstantFilter.cxx with 75% similarity]
lib/cpExtensions/Algorithms/KalmanConstantFilter.h [moved from lib/cpPlugins/Extensions/Algorithms/KalmanConstantFilter.h with 76% similarity]
lib/cpExtensions/Algorithms/KalmanFilter.cxx [moved from lib/cpPlugins/Extensions/Algorithms/KalmanFilter.cxx with 84% similarity]
lib/cpExtensions/Algorithms/KalmanFilter.h [moved from lib/cpPlugins/Extensions/Algorithms/KalmanFilter.h with 93% similarity]
lib/cpExtensions/Algorithms/KalmanFilter.hxx [moved from lib/cpPlugins/Extensions/Algorithms/KalmanFilter.hxx with 75% similarity]
lib/cpExtensions/Algorithms/KalmanVelocityFilter.cxx [moved from lib/cpPlugins/Extensions/Algorithms/KalmanVelocityFilter.cxx with 79% similarity]
lib/cpExtensions/Algorithms/KalmanVelocityFilter.h [moved from lib/cpPlugins/Extensions/Algorithms/KalmanVelocityFilter.h with 79% similarity]
lib/cpExtensions/Algorithms/LightCompensationFilter.h [moved from lib/cpPlugins/Extensions/Algorithms/LightCompensationFilter.h with 73% similarity]
lib/cpExtensions/Algorithms/LightCompensationFilter.hxx [moved from lib/cpPlugins/Extensions/Algorithms/LightCompensationFilter.hxx with 82% similarity]
lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h [moved from lib/cpPlugins/Extensions/Algorithms/MultiScaleGaussianImageFilter.h with 86% similarity]
lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx [moved from lib/cpPlugins/Extensions/Algorithms/MultiScaleGaussianImageFilter.hxx with 89% similarity]
lib/cpExtensions/Algorithms/ParallelImageMean.h [moved from lib/cpPlugins/Extensions/Algorithms/ParallelImageMean.h with 83% similarity]
lib/cpExtensions/Algorithms/ParallelImageMean.hxx [moved from lib/cpPlugins/Extensions/Algorithms/ParallelImageMean.hxx with 73% similarity]
lib/cpExtensions/Algorithms/RGBExtractFunction.h [moved from lib/cpPlugins/Extensions/Algorithms/RGBExtractFunction.h with 81% similarity]
lib/cpExtensions/Algorithms/RGBImageToOtherChannelsFilter.h [moved from lib/cpPlugins/Extensions/Algorithms/RGBImageToOtherChannelsFilter.h with 83% similarity]
lib/cpExtensions/Algorithms/RGBImageToOtherChannelsFilter.hxx [moved from lib/cpPlugins/Extensions/Algorithms/RGBImageToOtherChannelsFilter.hxx with 75% similarity]
lib/cpExtensions/Algorithms/RGBToHSVFunction.h [moved from lib/cpPlugins/Extensions/Algorithms/RGBToHSVFunction.h with 89% similarity]
lib/cpExtensions/Algorithms/RGBToRGBFunction.h [moved from lib/cpPlugins/Extensions/Algorithms/RGBToRGBFunction.h with 80% similarity]
lib/cpExtensions/Algorithms/RGBToYPbPrFunction.h [moved from lib/cpPlugins/Extensions/Algorithms/RGBToYPbPrFunction.h with 85% similarity]
lib/cpExtensions/CMakeLists.txt [moved from lib/cpPlugins/Extensions/CMakeLists.txt with 88% similarity]
lib/cpExtensions/DataStructures/ITKAndVTKImage.h [moved from lib/cpPlugins/Extensions/DataStructures/ITKAndVTKImage.h with 91% similarity]
lib/cpExtensions/DataStructures/QuadEdge.h [moved from lib/cpPlugins/Extensions/DataStructures/QuadEdge.h with 98% similarity]
lib/cpExtensions/DataStructures/QuadEdge.hxx [moved from lib/cpPlugins/Extensions/DataStructures/QuadEdge.hxx with 80% similarity]
lib/cpExtensions/DataStructures/QuadEdgeCell.h [moved from lib/cpPlugins/Extensions/DataStructures/QuadEdgeCell.h with 93% similarity]
lib/cpExtensions/DataStructures/QuadEdgeCell.hxx [moved from lib/cpPlugins/Extensions/DataStructures/QuadEdgeCell.hxx with 70% similarity]
lib/cpExtensions/DataStructures/QuadEdgeIterators.h [moved from lib/cpPlugins/Extensions/DataStructures/QuadEdgeIterators.h with 93% similarity]
lib/cpExtensions/DataStructures/QuadEdgeIterators.hxx [moved from lib/cpPlugins/Extensions/DataStructures/QuadEdgeIterators.hxx with 71% similarity]
lib/cpExtensions/DataStructures/QuadEdgeMesh.h [moved from lib/cpPlugins/Extensions/DataStructures/QuadEdgeMesh.h with 95% similarity]
lib/cpExtensions/DataStructures/QuadEdgeMesh.hxx [moved from lib/cpPlugins/Extensions/DataStructures/QuadEdgeMesh.hxx with 83% similarity]
lib/cpExtensions/IO/MeshReader.h [moved from lib/cpPlugins/Extensions/IO/MeshReader.h with 81% similarity]
lib/cpExtensions/IO/MeshReader.hxx [moved from lib/cpPlugins/Extensions/IO/MeshReader.hxx with 76% similarity]
lib/cpExtensions/IO/WaveFrontOBJReader.h [moved from lib/cpPlugins/Extensions/IO/WaveFrontOBJReader.h with 88% similarity]
lib/cpExtensions/IO/WaveFrontOBJReader.hxx [moved from lib/cpPlugins/Extensions/IO/WaveFrontOBJReader.hxx with 88% similarity]
lib/cpExtensions/Visualization/Image3DMPR.cxx [moved from lib/cpPlugins/Extensions/Visualization/Image3DMPR.cxx with 91% similarity]
lib/cpExtensions/Visualization/Image3DMPR.h [moved from lib/cpPlugins/Extensions/Visualization/Image3DMPR.h with 88% similarity]
lib/cpExtensions/Visualization/ImageInteractorStyle.cxx [moved from lib/cpPlugins/Extensions/Visualization/ImageInteractorStyle.cxx with 88% similarity]
lib/cpExtensions/Visualization/ImageInteractorStyle.h [moved from lib/cpPlugins/Extensions/Visualization/ImageInteractorStyle.h with 92% similarity]
lib/cpExtensions/Visualization/ImageSliceActors.cxx [moved from lib/cpPlugins/Extensions/Visualization/ImageSliceActors.cxx with 89% similarity]
lib/cpExtensions/Visualization/ImageSliceActors.h [moved from lib/cpPlugins/Extensions/Visualization/ImageSliceActors.h with 88% similarity]
lib/cpExtensions/Visualization/MPRActors.cxx [moved from lib/cpPlugins/Extensions/Visualization/MPRActors.cxx with 87% similarity]
lib/cpExtensions/Visualization/MPRActors.h [moved from lib/cpPlugins/Extensions/Visualization/MPRActors.h with 85% similarity]
lib/cpExtensions/Visualization/MPRWithDifferentWindows.cxx [moved from lib/cpPlugins/Extensions/Visualization/MPRWithDifferentWindows.cxx with 84% similarity]
lib/cpExtensions/Visualization/MPRWithDifferentWindows.h [moved from lib/cpPlugins/Extensions/Visualization/MPRWithDifferentWindows.h with 80% similarity]
lib/cpExtensions/Visualization/MeshMapper.h [moved from lib/cpPlugins/Extensions/Visualization/MeshMapper.h with 89% similarity]
lib/cpExtensions/Visualization/MeshMapper.hxx [moved from lib/cpPlugins/Extensions/Visualization/MeshMapper.hxx with 75% similarity]
lib/cpExtensions/Visualization/OpenGLMeshMapper.h [moved from lib/cpPlugins/Extensions/Visualization/OpenGLMeshMapper.h with 79% similarity]
lib/cpExtensions/Visualization/OpenGLMeshMapper.hxx [moved from lib/cpPlugins/Extensions/Visualization/OpenGLMeshMapper.hxx with 96% similarity]
lib/cpExtensions/Visualization/SeedWidgetCorrector.cxx [moved from lib/cpPlugins/Extensions/Visualization/SeedWidgetCorrector.cxx with 78% similarity]
lib/cpExtensions/Visualization/SeedWidgetCorrector.h [moved from lib/cpPlugins/Extensions/Visualization/SeedWidgetCorrector.h with 60% similarity]
lib/cpPlugins/CMakeLists.txt
lib/cpPlugins/Interface/DataObject.h
lib/cpPlugins/Interface/FilterObject.h
lib/cpPlugins/Interface/Image.h
lib/cpPlugins/Interface/ImageSink.h
lib/cpPlugins/Interface/ImageSource.h
lib/cpPlugins/Interface/ImageToImageFilter.h
lib/cpPlugins/Interface/ImageToMeshFilter.h
lib/cpPlugins/Interface/Interface.h
lib/cpPlugins/Interface/Mesh.h
lib/cpPlugins/Interface/MeshSink.h
lib/cpPlugins/Interface/MeshSource.h
lib/cpPlugins/Interface/MeshToImageFilter.h
lib/cpPlugins/Interface/MeshToMeshFilter.h
lib/cpPlugins/Interface/Object.h
lib/cpPlugins/Interface/Parameters.h
lib/cpPlugins/Interface/ProcessObject.h
lib/cpPlugins/Interface/SinkObject.h
lib/cpPlugins/Interface/SourceObject.h
lib/cpPlugins/Plugins/ImageReader.h
lib/cpPlugins/Plugins/ImageWriter.h
lib/cpPlugins/Plugins/MarchingCubes.h
lib/cpPlugins/Plugins/MeshReader.h
lib/cpPlugins/Plugins/MeshWriter.h
lib/cpPlugins/Plugins/OtsuThresholdImageFilter.h

index 56b4f3847de2fe1e34d166c8786af7e477bb7a19..7d5ad93fbb504388024e397a94abcea298180d83 100644 (file)
@@ -57,9 +57,9 @@ IF(USE_QT4)
     )
   TARGET_LINK_LIBRARIES(
     ${App_NAME}
-    cpPlugins_Interface
     ${QT_LIBRARIES}
-    vtkGUISupportQt
+       cpExtensions
+    ##vtkGUISupportQt
     )
 ENDIF(USE_QT4)
 
index 5fdf07a45f171c30841a5981d23d0dd7ae8b2af8..b0ba3c4268480963dfd1de33c239fbd4e711ab4c 100644 (file)
@@ -17,7 +17,7 @@
 #include <cpPlugins/Interface/ProcessObject.h>
 #include <cpPlugins/Interface/Image.h>
 #include <cpPlugins/Interface/Mesh.h>
-#include <cpPlugins/Extensions/Visualization/MPRWithDifferentWindows.h>
+#include <cpExtensions/Visualization/MPRWithDifferentWindows.h>
 
 // -------------------------------------------------------------------------
 namespace Ui
@@ -44,7 +44,7 @@ public:
   typedef cpPlugins::Interface::Parameters    TParameters;
 
   typedef std::set< std::string > TStringContainer;
-  typedef cpPlugins::Extensions::Visualization::MPRWithDifferentWindows TMPR;
+  typedef cpExtensions::Visualization::MPRWithDifferentWindows TMPR;
 
 public:
   explicit ImageMPR( QWidget* parent = 0 );
index 92a28a597d42c255b0f0363bc5e85fbc6a1fc75d..1de245a6dcddee57c01bd7365a1fb6d42404e41c 100644 (file)
@@ -6,10 +6,10 @@
 SET(
   EXAMPLES_PROGRAMS
   ## example_TestParameters
-  example_LoadPlugins
-  example_ReadWriteImage
-  example_MarchingCubes
-  example_OtsuFilter
+  #example_LoadPlugins
+  #example_ReadWriteImage
+  #example_MarchingCubes
+  #example_OtsuFilter
   ## example_ReadImageSeriesWriteImage
   ## example_ReadQuadEdgeMesh
   ## example_RenderQuadEdgeMesh
@@ -23,10 +23,10 @@ FOREACH(prog ${EXAMPLES_PROGRAMS})
     ${prog}
     ${prog}.cxx
     )
-  TARGET_LINK_LIBRARIES(
-    ${prog}
-    cpPlugins_Interface
-    )
+  #TARGET_LINK_LIBRARIES(
+  #  ${prog}
+  #  cpPlugins_Interface
+  #  )
 ENDFOREACH(prog)
 
 SET(
@@ -52,7 +52,7 @@ FOREACH(prog ${NOPLUGINS_EXAMPLES_PROGRAMS})
   TARGET_LINK_LIBRARIES(
     ${prog}
     ${ITK_LIBRARIES}
-    cpPlugins_Extensions
+    cpExtensions
     )
 ENDFOREACH(prog)
 
index ef245aa2eebbe97e3a57659c2dbc876636504abc..05dcd2ba1cfa4a55b6be40a4ce89455d3f51208a 100644 (file)
@@ -1,4 +1,5 @@
 SUBDIRS(
+  cpExtensions
   cpPlugins
   third_party
   )
similarity index 85%
rename from lib/cpPlugins/Extensions/Algorithms/BezierCurveFunction.h
rename to lib/cpExtensions/Algorithms/BezierCurveFunction.h
index 641220cf22abbb3bc3e84f34b0d1b2293bdbb1bc..d15f3286fe8374f21a8a0d138b619131e63dfab3 100644 (file)
@@ -2,16 +2,14 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__H__
+#define __CPEXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__H__
 
 #include <vector>
 #include <itkFunctionBase.h>
 #include <itkMatrix.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -67,12 +65,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/BezierCurveFunction.hxx>
+#include <cpExtensions/Algorithms/BezierCurveFunction.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__H__
 
 // eof - $RCSfile$
similarity index 80%
rename from lib/cpPlugins/Extensions/Algorithms/BezierCurveFunction.hxx
rename to lib/cpExtensions/Algorithms/BezierCurveFunction.hxx
index 3aedf8f92a547b144593bdfcda1dda49f5a597c6..684360f8fcfedef191e40b3981e0debeec27a7f4 100644 (file)
@@ -2,12 +2,12 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__HXX__
 
 // -------------------------------------------------------------------------
 template< class V >
-void cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
+void cpExtensions::Algorithms::BezierCurveFunction< V >::
 AddPoint( const TVector& v )
 {
   this->m_Vectors.push_back( v );
@@ -17,7 +17,7 @@ AddPoint( const TVector& v )
 
 // -------------------------------------------------------------------------
 template< class V >
-unsigned int cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
+unsigned int cpExtensions::Algorithms::BezierCurveFunction< V >::
 GetNumberOfPoints( ) const
 {
   return( this->m_Vectors.size( ) );
@@ -25,8 +25,8 @@ GetNumberOfPoints( ) const
 
 // -------------------------------------------------------------------------
 template< class V >
-typename cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
-TVector cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
+typename cpExtensions::Algorithms::BezierCurveFunction< V >::
+TVector cpExtensions::Algorithms::BezierCurveFunction< V >::
 Evaluate( const TScalar& u ) const
 {
   TVectorsContainer Q = this->m_Vectors;
@@ -47,8 +47,8 @@ Evaluate( const TScalar& u ) const
 
 // -------------------------------------------------------------------------
 template< class V >
-typename cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
-TFrame cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
+typename cpExtensions::Algorithms::BezierCurveFunction< V >::
+TFrame cpExtensions::Algorithms::BezierCurveFunction< V >::
 EvaluateFrenetFrame( const TScalar& u ) const
 {
   TFrame fr;
@@ -108,8 +108,8 @@ EvaluateFrenetFrame( const TScalar& u ) const
 
 // -------------------------------------------------------------------------
 template< class V >
-typename cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
-TScalar cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
+typename cpExtensions::Algorithms::BezierCurveFunction< V >::
+TScalar cpExtensions::Algorithms::BezierCurveFunction< V >::
 EvaluateLength( ) const
 {
   unsigned int n = this->GetNumberOfPoints( ) << 1;
@@ -127,7 +127,7 @@ EvaluateLength( ) const
 
 // -------------------------------------------------------------------------
 template< class V >
-cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
+cpExtensions::Algorithms::BezierCurveFunction< V >::
 BezierCurveFunction( )
   : Superclass( ),
     m_DerivativeUpdated( false )
@@ -136,7 +136,7 @@ BezierCurveFunction( )
 
 // -------------------------------------------------------------------------
 template< class V >
-void cpPlugins::Extensions::Algorithms::BezierCurveFunction< V >::
+void cpExtensions::Algorithms::BezierCurveFunction< V >::
 _UpdateDerivative( ) const
 {
   if( this->m_DerivativeUpdated )
@@ -150,6 +150,6 @@ _UpdateDerivative( ) const
       );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__BEZIERCURVEFUNCTION__HXX__
 
 // eof - $RCSfile$
similarity index 87%
rename from lib/cpPlugins/Extensions/Algorithms/GradientFunctionBase.h
rename to lib/cpExtensions/Algorithms/GradientFunctionBase.h
index 03107833e75f3eafa0d30bf7cc9711d3dd470724..a120a463211d230d55f74f4a8f22170b3377ecac 100644 (file)
@@ -2,15 +2,13 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__H__
+#define __CPEXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__H__
 
 #include <map>
 #include <itkImageFunction.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -75,12 +73,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/GradientFunctionBase.hxx>
+#include <cpExtensions/Algorithms/GradientFunctionBase.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__H__
 
 // eof - $RCSfile$
similarity index 68%
rename from lib/cpPlugins/Extensions/Algorithms/GradientFunctionBase.hxx
rename to lib/cpExtensions/Algorithms/GradientFunctionBase.hxx
index eaf9cf98e5c1f8aed3bc5fa206dd368277fbfd02..cc0bac36b402997515b43a5f9b13fc661351f93d 100644 (file)
@@ -2,12 +2,12 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__HXX__
 
 // -------------------------------------------------------------------------
 template< class G >
-void cpPlugins::Extensions::Algorithms::GradientFunctionBase< G >::
+void cpExtensions::Algorithms::GradientFunctionBase< G >::
 ResetBuffer( )
 {
   this->m_Buffer.clear( );
@@ -15,8 +15,8 @@ ResetBuffer( )
 
 // -------------------------------------------------------------------------
 template< class G >
-typename cpPlugins::Extensions::Algorithms::GradientFunctionBase< G >::
-TOutput cpPlugins::Extensions::Algorithms::GradientFunctionBase< G >::
+typename cpExtensions::Algorithms::GradientFunctionBase< G >::
+TOutput cpExtensions::Algorithms::GradientFunctionBase< G >::
 Evaluate( const TPoint& p ) const
 {
   TIndex i;
@@ -26,8 +26,8 @@ Evaluate( const TPoint& p ) const
 
 // -------------------------------------------------------------------------
 template< class G >
-typename cpPlugins::Extensions::Algorithms::GradientFunctionBase< G >::
-TOutput cpPlugins::Extensions::Algorithms::GradientFunctionBase< G >::
+typename cpExtensions::Algorithms::GradientFunctionBase< G >::
+TOutput cpExtensions::Algorithms::GradientFunctionBase< G >::
 EvaluateAtIndex( const TIndex& i ) const
 {
   TOutput res = TOutput( 0 );
@@ -50,8 +50,8 @@ EvaluateAtIndex( const TIndex& i ) const
 
 // -------------------------------------------------------------------------
 template< class G >
-typename cpPlugins::Extensions::Algorithms::GradientFunctionBase< G >::
-TOutput cpPlugins::Extensions::Algorithms::GradientFunctionBase< G >::
+typename cpExtensions::Algorithms::GradientFunctionBase< G >::
+TOutput cpExtensions::Algorithms::GradientFunctionBase< G >::
 EvaluateAtContinuousIndex( const TContIndex& i ) const
 {
   TPoint p;
@@ -61,7 +61,7 @@ EvaluateAtContinuousIndex( const TContIndex& i ) const
 
 // -------------------------------------------------------------------------
 template< class G >
-cpPlugins::Extensions::Algorithms::GradientFunctionBase< G >::
+cpExtensions::Algorithms::GradientFunctionBase< G >::
 GradientFunctionBase( )
   : Superclass( ),
     m_BufferResults( false )
@@ -71,12 +71,12 @@ GradientFunctionBase( )
 
 // -------------------------------------------------------------------------
 template< class G >
-cpPlugins::Extensions::Algorithms::GradientFunctionBase< G >::
+cpExtensions::Algorithms::GradientFunctionBase< G >::
 ~GradientFunctionBase( )
 {
   this->m_Buffer.clear( );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__GRADIENTFUNCTIONBASE__HXX__
 
 // eof - $RCSfile$
similarity index 85%
rename from lib/cpPlugins/Extensions/Algorithms/GulsunTekMedialness.h
rename to lib/cpExtensions/Algorithms/GulsunTekMedialness.h
index 9f942e8b0e5aaa43250eee125693d3b71c03672a..7ecdce9a6aa1455196c9c74fcdeea230f53d762a 100644 (file)
@@ -2,15 +2,13 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__H__
+#define __CPEXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__H__
 
 #include <vector>
-#include <cpPlugins/Extensions/Algorithms/GradientFunctionBase.h>
+#include <cpExtensions/Algorithms/GradientFunctionBase.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -76,12 +74,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/GulsunTekMedialness.hxx>
+#include <cpExtensions/Algorithms/GulsunTekMedialness.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__H__
 
 // eof - $RCSfile$
similarity index 91%
rename from lib/cpPlugins/Extensions/Algorithms/GulsunTekMedialness.hxx
rename to lib/cpExtensions/Algorithms/GulsunTekMedialness.hxx
index af30c7404d1cd84f58ec9fb1b87ff40239a75c1a..d4d4556cadcab2da40ba6ebae0534cc91086c9a0 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__HXX__
 
 #include <cmath>
 #include <vnl/vnl_math.h>
@@ -18,7 +18,7 @@
 
 // -------------------------------------------------------------------------
 template< class G >
-cpPlugins::Extensions::Algorithms::GulsunTekMedialness< G >::
+cpExtensions::Algorithms::GulsunTekMedialness< G >::
 GulsunTekMedialness( )
   : Superclass( ),
     m_MinRadius( double( 0 ) ),
@@ -30,15 +30,15 @@ GulsunTekMedialness( )
 
 // -------------------------------------------------------------------------
 template< class G >
-cpPlugins::Extensions::Algorithms::GulsunTekMedialness< G >::
+cpExtensions::Algorithms::GulsunTekMedialness< G >::
 ~GulsunTekMedialness( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class G >
-typename cpPlugins::Extensions::Algorithms::GulsunTekMedialness< G >::
-TOutput cpPlugins::Extensions::Algorithms::GulsunTekMedialness< G >::
+typename cpExtensions::Algorithms::GulsunTekMedialness< G >::
+TOutput cpExtensions::Algorithms::GulsunTekMedialness< G >::
 _Evaluate( const TIndex& i ) const
 {
   const G* gradient = this->GetInputImage( );
@@ -192,6 +192,6 @@ _Evaluate( const TIndex& i ) const
   */
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__GULSUNTEKMEDIALNESS__HXX__
 
 // eof - $RCSfile$
similarity index 88%
rename from lib/cpPlugins/Extensions/Algorithms/ImageFunctionFilter.h
rename to lib/cpExtensions/Algorithms/ImageFunctionFilter.h
index 4a938afebe4684bc88434413d27fb0310280af45..c025bcb30837580abecb12ddb8e7f18273ffa272 100644 (file)
@@ -2,17 +2,15 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__IMAGEFUNCTIONFILTER__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__IMAGEFUNCTIONFILTER__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__IMAGEFUNCTIONFILTER__H__
+#define __CPEXTENSIONS__ALGORITHMS__IMAGEFUNCTIONFILTER__H__
 
 #include <itkImageToImageFilter.h>
 #include <itkImageScanlineConstIterator.h>
 #include <itkImageScanlineIterator.h>
 #include <itkProgressReporter.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -97,12 +95,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-// TODO: #include <cpPlugins/Extensions/Algorithms/ImageFunctionFilter.hxx>
+// TODO: #include <cpExtensions/Algorithms/ImageFunctionFilter.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__IMAGEFUNCTIONFILTER__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__IMAGEFUNCTIONFILTER__H__
 
 // eof - $RCSfile$
similarity index 90%
rename from lib/cpPlugins/Extensions/Algorithms/ImageFunctorFilter.h
rename to lib/cpExtensions/Algorithms/ImageFunctorFilter.h
index fee021ce09afc9f6ae21db9916b61adcfa54d5f5..782526f3998265f84c23c85bba98c26e4acd9f20 100644 (file)
@@ -2,17 +2,15 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__IMAGEFUNCTORFILTER__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__IMAGEFUNCTORFILTER__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__IMAGEFUNCTORFILTER__H__
+#define __CPEXTENSIONS__ALGORITHMS__IMAGEFUNCTORFILTER__H__
 
 #include <itkImageToImageFilter.h>
 #include <itkImageScanlineConstIterator.h>
 #include <itkImageScanlineIterator.h>
 #include <itkProgressReporter.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -97,10 +95,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__IMAGEFUNCTORFILTER__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__IMAGEFUNCTORFILTER__H__
 
 // eof - $RCSfile$
similarity index 94%
rename from lib/cpPlugins/Extensions/Algorithms/InertiaMedialness.h
rename to lib/cpExtensions/Algorithms/InertiaMedialness.h
index 478432a580e518b0911fc447e7905f8d544c269c..1190d5637a84e3aaa052dda243fc481814ee930b 100644 (file)
@@ -2,18 +2,16 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__INERTIAMEDIALNESS__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__INERTIAMEDIALNESS__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__INERTIAMEDIALNESS__H__
+#define __CPEXTENSIONS__ALGORITHMS__INERTIAMEDIALNESS__H__
 
 #include <map>
 #include <itkImageFunction.h>
 
-#include <cpPlugins/Extensions/Algorithms/InertiaTensorFunction.h>
+#include <cpExtensions/Algorithms/InertiaTensorFunction.h>
 #include <itkImageRegionConstIteratorWithIndex.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -206,12 +204,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-// TODO: #include <cpPlugins/Extensions/Algorithms/InertiaMedialness.hxx>
+// TODO: #include <cpExtensions/Algorithms/InertiaMedialness.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__INERTIAMEDIALNESS__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__INERTIAMEDIALNESS__H__
 
 // eof - $RCSfile$
similarity index 93%
rename from lib/cpPlugins/Extensions/Algorithms/InertiaTensorFunction.h
rename to lib/cpExtensions/Algorithms/InertiaTensorFunction.h
index 515d5606fd7035c27d1a3287a10bfb208628a9a9..0d088d80a23d9bb780e63fb0e31ef5bb96df0b74 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__INERTIATENSORFUNCTION__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__INERTIATENSORFUNCTION__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__INERTIATENSORFUNCTION__H__
+#define __CPEXTENSIONS__ALGORITHMS__INERTIATENSORFUNCTION__H__
 
 #include <itkObject.h>
 
@@ -17,9 +17,7 @@
 #include <itkSymmetricEigenAnalysis.h>
 
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -171,12 +169,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-// #include <cpPlugins/Extensions/Algorithms/InertiaTensorFunction.hxx>
+// #include <cpExtensions/Algorithms/InertiaTensorFunction.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__INERTIATENSORFUNCTION__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__INERTIATENSORFUNCTION__H__
 
 // eof - $RCSfile$
similarity index 95%
rename from lib/cpPlugins/Extensions/Algorithms/IsoImageSlicer.h
rename to lib/cpExtensions/Algorithms/IsoImageSlicer.h
index e623670924c01dddcf6574139d51b9b7dc140cd9..9479d343cbea49fcde8e121fa79db02fea1034ab 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__ISOIMAGESLICER__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__ISOIMAGESLICER__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__ISOIMAGESLICER__H__
+#define __CPEXTENSIONS__ALGORITHMS__ISOIMAGESLICER__H__
 
 #include <itkAffineTransform.h>
 #include <itkExtractImageFilter.h>
@@ -14,9 +14,7 @@
 #include <itkVectorResampleImageFilter.h>
 #include <itkVectorInterpolateImageFunction.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -179,12 +177,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/IsoImageSlicer.hxx>
+#include <cpExtensions/Algorithms/IsoImageSlicer.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__ISOIMAGESLICER__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__ISOIMAGESLICER__H__
 
 // eof - $RCSfile$
similarity index 82%
rename from lib/cpPlugins/Extensions/Algorithms/IsoImageSlicer.hxx
rename to lib/cpExtensions/Algorithms/IsoImageSlicer.hxx
index fd90d02a4022f0eaa61ebe81a258241369e61a05..ff72c1a93e37964583d96ce9efd049dd16af146f 100644 (file)
@@ -2,12 +2,12 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__ISOIMAGESLICER__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__ISOIMAGESLICER__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__ISOIMAGESLICER__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__ISOIMAGESLICER__HXX__
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-unsigned long cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+unsigned long cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 GetMTime( ) const
 {
   unsigned long t = this->Superclass::GetMTime( );
@@ -22,9 +22,9 @@ GetMTime( ) const
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-const typename cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+const typename cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 TInterpolateFunction*
-cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 GetInterpolator( ) const
 {
   return( this->m_Slicer->GetInterpolator( ) );
@@ -32,8 +32,8 @@ GetInterpolator( ) const
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-const typename cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
-TMatrix& cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+const typename cpExtensions::Algorithms::BaseImageSlicer< R, I >::
+TMatrix& cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 GetRotation( ) const
 {
   return( this->m_Transform->GetMatrix( ) );
@@ -41,8 +41,8 @@ GetRotation( ) const
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-const typename cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
-TVector& cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+const typename cpExtensions::Algorithms::BaseImageSlicer< R, I >::
+TVector& cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 GetTranslation( ) const
 {
   return( this->m_Transform->GetOffset( ) );
@@ -50,7 +50,7 @@ GetTranslation( ) const
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-void cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+void cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 SetInterpolator( TInterpolateFunction* f )
 {
   this->m_Slicer->SetInterpolator( f );
@@ -60,7 +60,7 @@ SetInterpolator( TInterpolateFunction* f )
 // -------------------------------------------------------------------------
 template< class R, class I >
 template< class M >
-void cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+void cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 SetRotation( const M& r )
 {
   TMatrix rotation;
@@ -74,7 +74,7 @@ SetRotation( const M& r )
 // -------------------------------------------------------------------------
 template< class R, class I >
 template< class V >
-void cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+void cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 SetTranslation( const V& t )
 {
   TVector off;
@@ -86,7 +86,7 @@ SetTranslation( const V& t )
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-void cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+void cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 SetSize( TScalar s )
 {
   this->m_Size.Fill( s );
@@ -95,7 +95,7 @@ SetSize( TScalar s )
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 BaseImageSlicer( )
   : Superclass( ),
     m_SizeFromMaximum( false ),
@@ -123,21 +123,21 @@ BaseImageSlicer( )
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 ~BaseImageSlicer( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-void cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+void cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 GenerateOutputInformation( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-void cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+void cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 GenerateInputRequestedRegion( )
 {
   TImage* input = const_cast< TImage* >( this->GetInput( ) );
@@ -147,7 +147,7 @@ GenerateInputRequestedRegion( )
 
 // -------------------------------------------------------------------------
 template< class R, class I >
-void cpPlugins::Extensions::Algorithms::BaseImageSlicer< R, I >::
+void cpExtensions::Algorithms::BaseImageSlicer< R, I >::
 GenerateData( )
 {
   const TImage* input = this->GetInput( );
@@ -228,6 +228,6 @@ GenerateData( )
   this->GraftOutput( this->m_Collapsor->GetOutput( ) );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__ISOIMAGESLICER__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__ISOIMAGESLICER__HXX__
 
 // eof - $RCSfile$
similarity index 87%
rename from lib/cpPlugins/Extensions/Algorithms/IterativeGaussianModelEstimator.h
rename to lib/cpExtensions/Algorithms/IterativeGaussianModelEstimator.h
index 017691e292548c3216a91376348ef0bffb017cb8..aa8e6688cc177e918cc18f7cb74a1346b3be00e7 100644 (file)
@@ -2,17 +2,15 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__H__
+#define __CPEXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__H__
 
 #include <vector>
 #include <itkConceptChecking.h>
 #include <itkObject.h>
 #include <vnl/vnl_matrix.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -102,12 +100,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/IterativeGaussianModelEstimator.hxx>
+#include <cpExtensions/Algorithms/IterativeGaussianModelEstimator.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__H__
 
 // eof - $RCSfile$
similarity index 82%
rename from lib/cpPlugins/Extensions/Algorithms/IterativeGaussianModelEstimator.hxx
rename to lib/cpExtensions/Algorithms/IterativeGaussianModelEstimator.hxx
index b0d0505fc2a90de2c8cd98641117cf6413f8436f..c6e3cb8fdc6fd444a725528114cc1eedcea94624 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__HXX__
 
 #include <cmath>
 #include <cstdarg>
@@ -13,8 +13,7 @@
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-void
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+void cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 SetNumberOfSamples( unsigned long n )
 {
   this->m_N = S( n );
@@ -24,8 +23,7 @@ SetNumberOfSamples( unsigned long n )
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-void
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+void cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 SetMu( const TMatrix& m )
 {
   if( m.rows( ) == D && m.columns( ) == 1 )
@@ -45,8 +43,7 @@ SetMu( const TMatrix& m )
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-void
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+void cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 SetOmega( const TMatrix& O )
 {
   if( O.rows( ) == D && O.columns( ) == D )
@@ -66,8 +63,7 @@ SetOmega( const TMatrix& O )
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-bool
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+bool cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 SaveModelToFile( const std::string& filename ) const
 {
   std::ofstream out( filename.c_str( ) );
@@ -85,8 +81,7 @@ SaveModelToFile( const std::string& filename ) const
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-bool
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+bool cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 LoadModelFromFile( const std::string& filename )
 {
   std::ifstream in( filename.c_str( ) );
@@ -109,7 +104,7 @@ LoadModelFromFile( const std::string& filename )
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
 template< class V >
-S cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+S cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 Probability( const V& sample ) const
 {
   if( !this->m_Updated )
@@ -140,7 +135,7 @@ Probability( const V& sample ) const
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-S cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+S cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 Probability( const S& s_x, const S& s_y, ... ) const
 {
   static S sample[ D ];
@@ -158,8 +153,7 @@ Probability( const S& s_x, const S& s_y, ... ) const
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
 template< class V, class M >
-void
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+void cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 GetModel( V& m, M& E ) const
 {
   if( !this->m_Updated )
@@ -175,8 +169,7 @@ GetModel( V& m, M& E ) const
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-void
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+void cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 Clear( )
 {
   this->m_N = S( 0 );
@@ -191,8 +184,7 @@ Clear( )
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
 template< class V >
-void
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+void cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 AddSample( const V& sample )
 {
   TMatrix s( D, 1 );
@@ -224,8 +216,7 @@ AddSample( const V& sample )
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-void
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+void cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 AddSample( const S& s_x, const S& s_y, ... )
 {
   static S sample[ D ];
@@ -246,7 +237,7 @@ AddSample( const S& s_x, const S& s_y, ... )
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 IterativeGaussianModelEstimator( )
   : Superclass( )
 {
@@ -255,15 +246,14 @@ IterativeGaussianModelEstimator( )
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 ~IterativeGaussianModelEstimator( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class S, unsigned int D >
-void
-cpPlugins::Extensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
+void cpExtensions::Algorithms::IterativeGaussianModelEstimator< S, D >::
 _UpdateModel( ) const
 {
   static const double _2piD =
@@ -296,6 +286,6 @@ _UpdateModel( ) const
   this->m_Updated = true;
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__ITERATIVEGAUSSIANMODELESTIMATOR__HXX__
 
 // eof - $RCSfile$
similarity index 75%
rename from lib/cpPlugins/Extensions/Algorithms/KalmanConstantFilter.cxx
rename to lib/cpExtensions/Algorithms/KalmanConstantFilter.cxx
index 219aff462c344d0e352af031abda5e4fbebd67bc..df901f0a751983edd8e73428629092263a63063f 100644 (file)
@@ -2,11 +2,11 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#include <cpPlugins/Extensions/Algorithms/KalmanConstantFilter.h>
+#include <cpExtensions/Algorithms/KalmanConstantFilter.h>
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanConstantFilter< T >::
+void cpExtensions::Algorithms::KalmanConstantFilter< T >::
 Configure( unsigned int m )
 {
   this->Superclass::Configure( m, 1, m );
@@ -14,7 +14,7 @@ Configure( unsigned int m )
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanConstantFilter< T >::
+void cpExtensions::Algorithms::KalmanConstantFilter< T >::
 Initialize( )
 {
   this->Superclass::Initialize( );
@@ -26,7 +26,7 @@ Initialize( )
 
 // -------------------------------------------------------------------------
 template< typename T >
-cpPlugins::Extensions::Algorithms::KalmanConstantFilter< T >::
+cpExtensions::Algorithms::KalmanConstantFilter< T >::
 KalmanConstantFilter( )
   : Superclass( )
 {
@@ -35,7 +35,7 @@ KalmanConstantFilter( )
 
 // -------------------------------------------------------------------------
 template< typename T >
-cpPlugins::Extensions::Algorithms::KalmanConstantFilter< T >::
+cpExtensions::Algorithms::KalmanConstantFilter< T >::
 ~KalmanConstantFilter( )
 {
 }
@@ -43,7 +43,7 @@ cpPlugins::Extensions::Algorithms::KalmanConstantFilter< T >::
 // -------------------------------------------------------------------------
 // Explicit instantiations
 
-using namespace cpPlugins::Extensions::Algorithms;
+using namespace cpExtensions::Algorithms;
 
 template class KalmanConstantFilter< float >;
 template class KalmanConstantFilter< double >;
similarity index 76%
rename from lib/cpPlugins/Extensions/Algorithms/KalmanConstantFilter.h
rename to lib/cpExtensions/Algorithms/KalmanConstantFilter.h
index 74d8ddf1534883a9ea52a0da086c00b5519bb27a..76fb1b464663c4700e3833be3c6435b631f2c377 100644 (file)
@@ -2,21 +2,19 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANCONSTANTFILTER__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANCONSTANTFILTER__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__KALMANCONSTANTFILTER__H__
+#define __CPEXTENSIONS__ALGORITHMS__KALMANCONSTANTFILTER__H__
 
-#include <cpPlugins/Extensions/Algorithms/KalmanFilter.h>
+#include <cpExtensions/Algorithms/KalmanFilter.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
       /**
        */
       template< typename T >
-      class cpPlugins_Extensions_EXPORT KalmanConstantFilter
+      class cpExtensions_EXPORT KalmanConstantFilter
         : public KalmanFilter< T >
       {
       public:
@@ -51,10 +49,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANCONSTANTFILTER__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__KALMANCONSTANTFILTER__H__
 
 // eof - $RCSfile$
similarity index 84%
rename from lib/cpPlugins/Extensions/Algorithms/KalmanFilter.cxx
rename to lib/cpExtensions/Algorithms/KalmanFilter.cxx
index c7f650d560cb999dd56fff701ffaf4aecd183f6e..e8424fcaab0f42aea3c09f95a8f474dc253667d6 100644 (file)
@@ -1,11 +1,11 @@
-#include <cpPlugins/Extensions/Algorithms/KalmanFilter.h>
+#include <cpExtensions/Algorithms/KalmanFilter.h>
 
 #include <cstdlib>
 #include <vnl/algo/vnl_matrix_inverse.h>
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanFilter< T >::
+void cpExtensions::Algorithms::KalmanFilter< T >::
 Configure( unsigned int s, unsigned int i, unsigned int m )
 {
   this->m_StateSize   = s;
@@ -37,7 +37,7 @@ Configure( unsigned int s, unsigned int i, unsigned int m )
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanFilter< T >::
+void cpExtensions::Algorithms::KalmanFilter< T >::
 Initialize( )
 {
   // Set all to the first iteration
@@ -47,7 +47,7 @@ Initialize( )
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanFilter< T >::
+void cpExtensions::Algorithms::KalmanFilter< T >::
 Predict( )
 {
   if( this->m_Step == Self::StFilt )
@@ -73,7 +73,7 @@ Predict( )
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanFilter< T >::
+void cpExtensions::Algorithms::KalmanFilter< T >::
 Innovate( )
 {
   typedef vnl_matrix_inverse< T > _TInv;
@@ -94,7 +94,7 @@ Innovate( )
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanFilter< T >::
+void cpExtensions::Algorithms::KalmanFilter< T >::
 Filtrate( )
 {
   if( this->m_Step == Self::StInno )
@@ -114,7 +114,7 @@ Filtrate( )
 
 // -------------------------------------------------------------------------
 template< typename T >
-cpPlugins::Extensions::Algorithms::KalmanFilter< T >::
+cpExtensions::Algorithms::KalmanFilter< T >::
 KalmanFilter( )
   : Superclass( )
 {
@@ -123,7 +123,7 @@ KalmanFilter( )
 
 // -------------------------------------------------------------------------
 template< typename T >
-cpPlugins::Extensions::Algorithms::KalmanFilter< T >::
+cpExtensions::Algorithms::KalmanFilter< T >::
 ~KalmanFilter( )
 {
 }
@@ -131,7 +131,7 @@ cpPlugins::Extensions::Algorithms::KalmanFilter< T >::
 // -------------------------------------------------------------------------
 // Explicit instantiations
 
-using namespace cpPlugins::Extensions::Algorithms;
+using namespace cpExtensions::Algorithms;
 
 template class KalmanFilter< float >;
 template class KalmanFilter< double >;
similarity index 93%
rename from lib/cpPlugins/Extensions/Algorithms/KalmanFilter.h
rename to lib/cpExtensions/Algorithms/KalmanFilter.h
index 849ac34fd5c38f0cc1ac9e735cabf6c7ca042412..de6090f98c72353c031905547cae6f7bf8a95eab 100644 (file)
@@ -2,10 +2,10 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANFILTER__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANFILTER__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__KALMANFILTER__H__
+#define __CPEXTENSIONS__ALGORITHMS__KALMANFILTER__H__
 
-#include <cpPlugins/Extensions/cpPlugins_Extensions_Export.h>
+#include <cpExtensions/cpExtensions_Export.h>
 
 #include <itkObject.h>
 #include <itkObjectFactory.h>
@@ -47,9 +47,7 @@
   kalmanGetVectorMacro( var, name );            \
   kalmanSetVectorMacro( var, name );
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -59,7 +57,7 @@ namespace cpPlugins
        * for a description of this algorithm.
        */
       template< typename T >
-      class cpPlugins_Extensions_EXPORT KalmanFilter
+      class cpExtensions_EXPORT KalmanFilter
         : public itk::Object
       {
       public:
@@ -206,12 +204,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/KalmanFilter.hxx>
+#include <cpExtensions/Algorithms/KalmanFilter.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANFILTER__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__KALMANFILTER__H__
 
 // eof - $RCSfile$
similarity index 75%
rename from lib/cpPlugins/Extensions/Algorithms/KalmanFilter.hxx
rename to lib/cpExtensions/Algorithms/KalmanFilter.hxx
index a75fb7f6b833c4cdf4d0828de544571bbc55b6b5..e81cae27edb84f8f1ba7fbbf3a33a91f403857af 100644 (file)
@@ -1,10 +1,10 @@
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANFILTER__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANFILTER__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__KALMANFILTER__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__KALMANFILTER__HXX__
 
 // -------------------------------------------------------------------------
 template< typename T >
 template< class M >
-void cpPlugins::Extensions::Algorithms::KalmanFilter< T >::
+void cpExtensions::Algorithms::KalmanFilter< T >::
 Kronecker( M& AkB, const M& A, const M& B )
 {
   unsigned int m = A.rows( ); unsigned int n = A.cols( );
@@ -32,6 +32,6 @@ Kronecker( M& AkB, const M& A, const M& B )
   } // rof
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANFILTER__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__KALMANFILTER__HXX__
 
 // eof - $RCSfile$
similarity index 79%
rename from lib/cpPlugins/Extensions/Algorithms/KalmanVelocityFilter.cxx
rename to lib/cpExtensions/Algorithms/KalmanVelocityFilter.cxx
index 6ec32956cc944f921cbd8128ccc31dc648ba83ac..1333bf86dee54bb29e3f8e20c0b85fbc81d5b633 100644 (file)
@@ -2,12 +2,12 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#include <cpPlugins/Extensions/Algorithms/KalmanVelocityFilter.h>
+#include <cpExtensions/Algorithms/KalmanVelocityFilter.h>
 #include <cmath>
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanVelocityFilter< T >::
+void cpExtensions::Algorithms::KalmanVelocityFilter< T >::
 Configure( unsigned int m )
 {
   this->Superclass::Configure( m << 1, 1, m );
@@ -21,8 +21,8 @@ Configure( unsigned int m )
 
 // -------------------------------------------------------------------------
 template< typename T >
-typename cpPlugins::Extensions::Algorithms::KalmanVelocityFilter< T >::
-TScalar cpPlugins::Extensions::Algorithms::KalmanVelocityFilter< T >::
+typename cpExtensions::Algorithms::KalmanVelocityFilter< T >::
+TScalar cpExtensions::Algorithms::KalmanVelocityFilter< T >::
 GetTimeOffset( ) const
 {
   return( TScalar( std::sqrt( double( this->m_TimeOffset[ 1 ][ 1 ] ) ) ) );
@@ -30,7 +30,7 @@ GetTimeOffset( ) const
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanVelocityFilter< T >::
+void cpExtensions::Algorithms::KalmanVelocityFilter< T >::
 SetTimeOffset( TScalar t )
 {
   TScalar t2 = t * t;
@@ -45,7 +45,7 @@ SetTimeOffset( TScalar t )
 
 // -------------------------------------------------------------------------
 template< typename T >
-void cpPlugins::Extensions::Algorithms::KalmanVelocityFilter< T >::
+void cpExtensions::Algorithms::KalmanVelocityFilter< T >::
 Initialize( )
 {
   this->Superclass::Initialize( );
@@ -67,7 +67,7 @@ Initialize( )
 
 // -------------------------------------------------------------------------
 template< typename T >
-cpPlugins::Extensions::Algorithms::KalmanVelocityFilter< T >::
+cpExtensions::Algorithms::KalmanVelocityFilter< T >::
 KalmanVelocityFilter( )
   : Superclass( )
 {
@@ -76,7 +76,7 @@ KalmanVelocityFilter( )
 
 // -------------------------------------------------------------------------
 template< typename T >
-cpPlugins::Extensions::Algorithms::KalmanVelocityFilter< T >::
+cpExtensions::Algorithms::KalmanVelocityFilter< T >::
 ~KalmanVelocityFilter( )
 {
 }
@@ -84,7 +84,7 @@ cpPlugins::Extensions::Algorithms::KalmanVelocityFilter< T >::
 // -------------------------------------------------------------------------
 // Explicit instantiations
 
-using namespace cpPlugins::Extensions::Algorithms;
+using namespace cpExtensions::Algorithms;
 
 template class KalmanVelocityFilter< float >;
 template class KalmanVelocityFilter< double >;
similarity index 79%
rename from lib/cpPlugins/Extensions/Algorithms/KalmanVelocityFilter.h
rename to lib/cpExtensions/Algorithms/KalmanVelocityFilter.h
index ba34d4defab547265947bc3be3419c342352a9fa..5dd3f56d3d2ee6951454eb9562e07aa573d89966 100644 (file)
@@ -2,21 +2,19 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANVELOCITYFILTER__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANVELOCITYFILTER__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__KALMANVELOCITYFILTER__H__
+#define __CPEXTENSIONS__ALGORITHMS__KALMANVELOCITYFILTER__H__
 
-#include <cpPlugins/Extensions/Algorithms/KalmanFilter.h>
+#include <cpExtensions/Algorithms/KalmanFilter.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
       /**
        */
       template< typename T >
-      class cpPlugins_Extensions_EXPORT KalmanVelocityFilter
+      class cpExtensions_EXPORT KalmanVelocityFilter
         : public KalmanFilter< T >
       {
       public:
@@ -61,10 +59,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__KALMANVELOCITYFILTER__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__KALMANVELOCITYFILTER__H__
 
 // eof - $RCSfile$
similarity index 73%
rename from lib/cpPlugins/Extensions/Algorithms/LightCompensationFilter.h
rename to lib/cpExtensions/Algorithms/LightCompensationFilter.h
index 596b5fa19f4d7ce0221122bd2cb0fc18a3453757..36f8da583948371d6c29383f9cf7920e40137000 100644 (file)
@@ -2,15 +2,13 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__H__
+#define __CPEXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__H__
 
 #include <itkInPlaceImageFilter.h>
-#include <cpPlugins/Extensions/Algorithms/ParallelImageMean.h>
+#include <cpExtensions/Algorithms/ParallelImageMean.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -29,7 +27,7 @@ namespace cpPlugins
         typedef I TImage;
         typedef typename I::RegionType TRegion;
 
-        typedef cpPlugins::Extensions::Algorithms::ParallelImageMean< I > TMeanCalculator;
+        typedef cpExtensions::Algorithms::ParallelImageMean< I > TMeanCalculator;
         typedef typename TMeanCalculator::TMean TMean;
 
       public:
@@ -54,14 +52,12 @@ namespace cpPlugins
         TMean m_Coefficient;
       };
 
-    } // ecapseman
-
   } // ecapseman
 
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/LightCompensationFilter.hxx>
+#include <cpExtensions/Algorithms/LightCompensationFilter.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__H__
 
 // eof - $RCSfile$
similarity index 82%
rename from lib/cpPlugins/Extensions/Algorithms/LightCompensationFilter.hxx
rename to lib/cpExtensions/Algorithms/LightCompensationFilter.hxx
index fef98fd6e51e7fffedb8fd316978dfb12cb149a2..f75ffcdd44ed4592ac2bbcfbc0fdd71ed7b48247 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__HXX__
 
 #include <itkImageRegionIterator.h>
 #include <itkImageRegionConstIterator.h>
@@ -11,7 +11,7 @@
 
 // -------------------------------------------------------------------------
 template< class I >
-cpPlugins::Extensions::Algorithms::LightCompensationFilter< I >::
+cpExtensions::Algorithms::LightCompensationFilter< I >::
 LightCompensationFilter( )
   : Superclass( )
 {
@@ -21,14 +21,14 @@ LightCompensationFilter( )
 
 // -------------------------------------------------------------------------
 template< class I >
-cpPlugins::Extensions::Algorithms::LightCompensationFilter< I >::
+cpExtensions::Algorithms::LightCompensationFilter< I >::
 ~LightCompensationFilter( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class I >
-void cpPlugins::Extensions::Algorithms::LightCompensationFilter< I >::
+void cpExtensions::Algorithms::LightCompensationFilter< I >::
 BeforeThreadedGenerateData( )
 {
   this->Superclass::BeforeThreadedGenerateData( );
@@ -50,7 +50,7 @@ BeforeThreadedGenerateData( )
 
 // -------------------------------------------------------------------------
 template< class I >
-void cpPlugins::Extensions::Algorithms::LightCompensationFilter< I >::
+void cpExtensions::Algorithms::LightCompensationFilter< I >::
 ThreadedGenerateData( const TRegion& region, itk::ThreadIdType id )
 {
   typedef itk::NumericTraits< typename I::PixelType > _TPixelTraits;
@@ -85,12 +85,12 @@ ThreadedGenerateData( const TRegion& region, itk::ThreadIdType id )
 
 // -------------------------------------------------------------------------
 template< class I >
-void cpPlugins::Extensions::Algorithms::LightCompensationFilter< I >::
+void cpExtensions::Algorithms::LightCompensationFilter< I >::
 AfterThreadedGenerateData( )
 {
   this->Superclass::AfterThreadedGenerateData( );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__LIGHTCOMPENSATIONFILTER__HXX__
 
 // eof - $RCSfile$
similarity index 86%
rename from lib/cpPlugins/Extensions/Algorithms/MultiScaleGaussianImageFilter.h
rename to lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h
index e90651264d1485f4ef462baecc969d7ae09aa6c0..2ad1b5072c26264d1aa6be9f3fd1e8b88816786e 100644 (file)
@@ -2,15 +2,13 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__H__
+#define __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__H__
 
 #include <set>
 #include <itkImageToImageFilter.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -91,14 +89,12 @@ namespace cpPlugins
         FilterId m_FilterId;
       };
 
-    } // ecapseman
-
   } // ecapseman
 
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/MultiScaleGaussianImageFilter.hxx>
+#include <cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__H__
 
 // eof - $RCSfile$
similarity index 89%
rename from lib/cpPlugins/Extensions/Algorithms/MultiScaleGaussianImageFilter.hxx
rename to lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.hxx
index 0ec51568de78b29d3141a0c2ef0957a69c86c12f..c2e7cffa8cc4373acbe58b922851852365c0744b 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__HXX__
 
 #include <vnl/vnl_vector.h>
 
@@ -20,7 +20,7 @@
 
 // -------------------------------------------------------------------------
 template< class I, class O >
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::_Greater::
 _Greater( )
 {
@@ -28,7 +28,7 @@ _Greater( )
 
 // -------------------------------------------------------------------------
 template< class I, class O >
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::_Greater::
 ~_Greater( )
 {
@@ -36,7 +36,7 @@ MultiScaleGaussianImageFilter< I, O >::_Greater::
 
 // -------------------------------------------------------------------------
 template< class I, class O >
-bool cpPlugins::Extensions::Algorithms::
+bool cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::_Greater::
 operator!=( const _Greater& b ) const
 {
@@ -45,7 +45,7 @@ operator!=( const _Greater& b ) const
 
 // -------------------------------------------------------------------------
 template< class I, class O >
-bool cpPlugins::Extensions::Algorithms::
+bool cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::_Greater::
 operator==( const _Greater& b ) const
 {
@@ -54,9 +54,9 @@ operator==( const _Greater& b ) const
 
 // -------------------------------------------------------------------------
 template< class I, class O >
-typename cpPlugins::Extensions::Algorithms::
+typename cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::_Greater::
-_T cpPlugins::Extensions::Algorithms::
+_T cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::_Greater::
 operator()( const _T& a ) const
 {
@@ -65,9 +65,9 @@ operator()( const _T& a ) const
 
 // -------------------------------------------------------------------------
 template< class I, class O >
-typename cpPlugins::Extensions::Algorithms::
+typename cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::_Greater::
-_T cpPlugins::Extensions::Algorithms::
+_T cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::_Greater::
 operator()( const _T& a, const _T& b ) const
 {
@@ -86,7 +86,7 @@ operator()( const _T& a, const _T& b ) const
 // -------------------------------------------------------------------------
 template< class I, class O >
 void
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 SetFilterToGradient( )
 {
@@ -103,7 +103,7 @@ SetFilterToGradient( )
 // -------------------------------------------------------------------------
 template< class I, class O >
 void
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 SetFilterToGradientMagnitude( )
 {
@@ -117,7 +117,7 @@ SetFilterToGradientMagnitude( )
 // -------------------------------------------------------------------------
 template< class I, class O >
 void
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 SetFilterToHessian( )
 {
@@ -127,7 +127,7 @@ SetFilterToHessian( )
 // -------------------------------------------------------------------------
 template< class I, class O >
 bool
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 IsGradientFilter( ) const
 {
@@ -137,7 +137,7 @@ IsGradientFilter( ) const
 // -------------------------------------------------------------------------
 template< class I, class O >
 bool
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 IsGradientMagnitudeFilter( ) const
 {
@@ -147,7 +147,7 @@ IsGradientMagnitudeFilter( ) const
 // -------------------------------------------------------------------------
 template< class I, class O >
 bool
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 IsHessianFilter( ) const
 {
@@ -157,7 +157,7 @@ IsHessianFilter( ) const
 // -------------------------------------------------------------------------
 template< class I, class O >
 void
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 AddScale( const double& s )
 {
@@ -168,7 +168,7 @@ AddScale( const double& s )
 // -------------------------------------------------------------------------
 template< class I, class O >
 unsigned long
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 GetNumberOfScales( ) const
 {
@@ -177,7 +177,7 @@ GetNumberOfScales( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class O >
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 MultiScaleGaussianImageFilter( )
   : Superclass( )
@@ -194,7 +194,7 @@ MultiScaleGaussianImageFilter( )
 
 // -------------------------------------------------------------------------
 template< class I, class O >
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 ~MultiScaleGaussianImageFilter( )
 {
@@ -203,7 +203,7 @@ MultiScaleGaussianImageFilter< I, O >::
 // -------------------------------------------------------------------------
 template< class I, class O >
 void
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 GenerateData( )
 {
@@ -223,7 +223,7 @@ GenerateData( )
 template< class I, class O >
 template< class F >
 void
-cpPlugins::Extensions::Algorithms::
+cpExtensions::Algorithms::
 MultiScaleGaussianImageFilter< I, O >::
 _GenerateData( )
 {
@@ -310,6 +310,6 @@ _GenerateData( )
   } // rof
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__MULTISCALEGAUSSIANIMAGEFILTER__HXX__
 
 // eof - $RCSfile$
similarity index 83%
rename from lib/cpPlugins/Extensions/Algorithms/ParallelImageMean.h
rename to lib/cpExtensions/Algorithms/ParallelImageMean.h
index c171d1a0c993b810cdbc56ecbd7cab4ce7b6a72b..f34ca6e5f2cf7bb9cc62179c44851625f1dc2786 100644 (file)
@@ -2,17 +2,15 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__H__
+#define __CPEXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__H__
 
 #include <itkDomainThreader.h>
 #include <itkThreadedImageRegionPartitioner.h>
 #include <itkArray.h>
 #include <itkNumericTraits.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -61,12 +59,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/ParallelImageMean.hxx>
+#include <cpExtensions/Algorithms/ParallelImageMean.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__H__
 
 // eof - $RCSfile$
similarity index 73%
rename from lib/cpPlugins/Extensions/Algorithms/ParallelImageMean.hxx
rename to lib/cpExtensions/Algorithms/ParallelImageMean.hxx
index bb066e19f5f75787f26e800deecf46ec6878b916..b3e4716075bdcaad0326ae229a0f4d2448299ba8 100644 (file)
@@ -2,14 +2,14 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__HXX__
 
 #include <itkImageRegionConstIterator.h>
 
 // -------------------------------------------------------------------------
 template< class I >
-cpPlugins::Extensions::Algorithms::ParallelImageMean< I >::
+cpExtensions::Algorithms::ParallelImageMean< I >::
 ParallelImageMean( )
   : Superclass( )
 {
@@ -17,14 +17,14 @@ ParallelImageMean( )
 
 // -------------------------------------------------------------------------
 template< class I >
-cpPlugins::Extensions::Algorithms::ParallelImageMean< I >::
+cpExtensions::Algorithms::ParallelImageMean< I >::
 ~ParallelImageMean( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class I >
-void cpPlugins::Extensions::Algorithms::ParallelImageMean< I >::
+void cpExtensions::Algorithms::ParallelImageMean< I >::
 BeforeThreadedExecution( )
 {
   this->m_Mean.SetSize( _TPixelTraits::GetLength( ) );
@@ -34,7 +34,7 @@ BeforeThreadedExecution( )
 
 // -------------------------------------------------------------------------
 template< class I >
-void cpPlugins::Extensions::Algorithms::ParallelImageMean< I >::
+void cpExtensions::Algorithms::ParallelImageMean< I >::
 ThreadedExecution( const DomainType& region, const itk::ThreadIdType id )
 {
   itk::ImageRegionConstIterator< I > i( this->m_Associate, region );
@@ -54,12 +54,12 @@ ThreadedExecution( const DomainType& region, const itk::ThreadIdType id )
 
 // -------------------------------------------------------------------------
 template< class I >
-void cpPlugins::Extensions::Algorithms::ParallelImageMean< I >::
+void cpExtensions::Algorithms::ParallelImageMean< I >::
 AfterThreadedExecution( )
 {
   this->m_Mean /= double( this->m_N );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__PARALLELIMAGEMEAN__HXX__
 
 // eof - $RCSfile$
similarity index 81%
rename from lib/cpPlugins/Extensions/Algorithms/RGBExtractFunction.h
rename to lib/cpExtensions/Algorithms/RGBExtractFunction.h
index d9d21bea7578eafa5b04334302d1ef15dff753d7..8db169720ee77e49f5c3826e4a937235c4bef34d 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBEXTRACTFUNCTION__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBEXTRACTFUNCTION__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__RGBEXTRACTFUNCTION__H__
+#define __CPEXTENSIONS__ALGORITHMS__RGBEXTRACTFUNCTION__H__
 
 #include <cmath>
 #include <limits>
@@ -12,9 +12,7 @@
 #include <itkRGBPixel.h>
 #include <itkVector.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -49,10 +47,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBEXTRACTFUNCTION__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__RGBEXTRACTFUNCTION__H__
 
 // eof - $RCSfile$
similarity index 83%
rename from lib/cpPlugins/Extensions/Algorithms/RGBImageToOtherChannelsFilter.h
rename to lib/cpExtensions/Algorithms/RGBImageToOtherChannelsFilter.h
index ad91f374854669807c4582b8ca171728b1a496d5..fb04b77583a5515b9913d24cf40f1d0c6e829c84 100644 (file)
@@ -2,14 +2,12 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__H__
+#define __CPEXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__H__
 
 #include <itkImageToImageFilter.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -71,12 +69,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/Algorithms/RGBImageToOtherChannelsFilter.hxx>
+#include <cpExtensions/Algorithms/RGBImageToOtherChannelsFilter.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__H__
 
 // eof - $RCSfile$
similarity index 75%
rename from lib/cpPlugins/Extensions/Algorithms/RGBImageToOtherChannelsFilter.hxx
rename to lib/cpExtensions/Algorithms/RGBImageToOtherChannelsFilter.hxx
index d0301c9aa78060757e0bbac83782bb14ceb52276..3c8f49d016842d7854bf26a46743399c97ac6d17 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__HXX__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__HXX__
+#ifndef __CPEXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__HXX__
+#define __CPEXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__HXX__
 
 #include <cmath>
 #include <limits>
@@ -14,8 +14,7 @@
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-O*
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+O* cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 GetChannel1( )
 {
   return( this->GetOutput( 0 ) );
@@ -23,8 +22,7 @@ GetChannel1( )
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-O*
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+O* cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 GetChannel2( )
 {
   return( this->GetOutput( 1 ) );
@@ -32,8 +30,7 @@ GetChannel2( )
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-O*
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+O* cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 GetChannel3( )
 {
   return( this->GetOutput( 2 ) );
@@ -41,8 +38,7 @@ GetChannel3( )
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-const O*
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+const O* cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 GetChannel1( ) const
 {
   if( this->GetNumberOfOutputs( ) > 0 )
@@ -57,8 +53,7 @@ GetChannel1( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-const O*
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+const O* cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 GetChannel2( ) const
 {
   if( this->GetNumberOfOutputs( ) > 1 )
@@ -73,8 +68,7 @@ GetChannel2( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-const O*
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+const O* cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 GetChannel3( ) const
 {
   if( this->GetNumberOfOutputs( ) > 2 )
@@ -89,8 +83,7 @@ GetChannel3( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-void
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+void cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 GraftChannel1( O* hue )
 {
   this->GraftNthOutput( 0, hue );
@@ -98,8 +91,7 @@ GraftChannel1( O* hue )
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-void
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+void cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 GraftChannel2( O* saturation )
 {
   this->GraftNthOutput( 1, saturation );
@@ -107,8 +99,7 @@ GraftChannel2( O* saturation )
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-void
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+void cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 GraftChannel3( O* value )
 {
   this->GraftNthOutput( 2, value );
@@ -116,7 +107,7 @@ GraftChannel3( O* value )
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 RGBImageToOtherChannelsFilter( )
   : Superclass( )
 {
@@ -132,31 +123,28 @@ RGBImageToOtherChannelsFilter( )
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 ~RGBImageToOtherChannelsFilter( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-void
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+void cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 BeforeThreadedGenerateData( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-void
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+void cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 AfterThreadedGenerateData( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class I, class O, class C >
-void
-cpPlugins::Extensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
+void cpExtensions::Algorithms::RGBImageToOtherChannelsFilter< I, O, C >::
 ThreadedGenerateData(
   const typename Superclass::OutputImageRegionType& region,
   itk::ThreadIdType threadId
@@ -185,6 +173,6 @@ ThreadedGenerateData(
   } // rof
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__HXX__
+#endif // __CPEXTENSIONS__ALGORITHMS__RGBIMAGETOOTHERCHANNELSFILTER__HXX__
 
 // eof - $RCSfile$
similarity index 89%
rename from lib/cpPlugins/Extensions/Algorithms/RGBToHSVFunction.h
rename to lib/cpExtensions/Algorithms/RGBToHSVFunction.h
index 81f7edd0ed052c021c2d5ffb73e2d8f1242e363a..8536b4aa8df1a876d88a0e193b391d2acb8d29cb 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBTOHSVFUNCTION__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBTOHSVFUNCTION__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__RGBTOHSVFUNCTION__H__
+#define __CPEXTENSIONS__ALGORITHMS__RGBTOHSVFUNCTION__H__
 
 #include <cmath>
 #include <limits>
@@ -12,9 +12,7 @@
 #include <itkRGBPixel.h>
 #include <itkVector.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -80,12 +78,10 @@ namespace cpPlugins
           }
       };
 
-    } // ecapseman
-
   } // ecapseman
 
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBTOHSVFUNCTION__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__RGBTOHSVFUNCTION__H__
 
 // eof - $RCSfile$
similarity index 80%
rename from lib/cpPlugins/Extensions/Algorithms/RGBToRGBFunction.h
rename to lib/cpExtensions/Algorithms/RGBToRGBFunction.h
index 177eee5c5507914d4a0e12e18730d439057c3d36..97b85ce14658f41a7f2f2ff51b43e7734f5d4c70 100644 (file)
@@ -2,16 +2,14 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBTORGBFUNCTION__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBTORGBFUNCTION__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__RGBTORGBFUNCTION__H__
+#define __CPEXTENSIONS__ALGORITHMS__RGBTORGBFUNCTION__H__
 
 #include <itkRGBPixel.h>
 #include <itkMatrix.h>
 #include <itkVector.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -46,10 +44,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBTORGBFUNCTION__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__RGBTORGBFUNCTION__H__
 
 // eof - $RCSfile$
similarity index 85%
rename from lib/cpPlugins/Extensions/Algorithms/RGBToYPbPrFunction.h
rename to lib/cpExtensions/Algorithms/RGBToYPbPrFunction.h
index 56ffd5c6a72eaa2c7b4144d9888b6f8b04a6c414..5b13a075395d95e4bbd66bf47fe3d8154c410bce 100644 (file)
@@ -2,8 +2,8 @@
 // @author Leonardo Florez-Valencia (florez-l@javeriana.edu.co)
 // -------------------------------------------------------------------------
 
-#ifndef __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBTOYPBPRFUNCTION__H__
-#define __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBTOYPBPRFUNCTION__H__
+#ifndef __CPEXTENSIONS__ALGORITHMS__RGBTOYPBPRFUNCTION__H__
+#define __CPEXTENSIONS__ALGORITHMS__RGBTOYPBPRFUNCTION__H__
 
 #include <cmath>
 #include <limits>
@@ -14,9 +14,7 @@
 #include <itkMatrix.h>
 #include <itkVector.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Algorithms
     {
@@ -60,10 +58,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__ALGORITHMS__RGBTOYPBPRFUNCTION__H__
+#endif // __CPEXTENSIONS__ALGORITHMS__RGBTOYPBPRFUNCTION__H__
 
 // eof - $RCSfile$
similarity index 88%
rename from lib/cpPlugins/Extensions/CMakeLists.txt
rename to lib/cpExtensions/CMakeLists.txt
index b18e5bdfd2b18a017b18895311a0197e1af9722f..376a35384ecdb2405eec10f09cc9f3bbb1f33336 100644 (file)
@@ -1,4 +1,4 @@
-SET(LIBRARY_NAME cpPlugins_Extensions)
+SET(LIBRARY_NAME cpExtensions)
 
 ## ===============
 ## = Source code =
@@ -66,7 +66,7 @@ GENERATE_EXPORT_HEADER(
   ${LIBRARY_NAME}
   BASE_NAME ${LIBRARY_NAME}
   EXPORT_MACRO_NAME ${LIBRARY_NAME}_EXPORT
-  EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/lib/cpPlugins/Extensions/${LIBRARY_NAME}_Export.h
+  EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/lib/cpExtensions/${LIBRARY_NAME}_Export.h
   STATIC_DEFINE ${LIBRARY_NAME}_BUILT_AS_STATIC
   )
 TARGET_LINK_LIBRARIES(
@@ -95,25 +95,25 @@ SET(
 FOREACH(dir ${local_install_dirs})
   INSTALL(
     DIRECTORY ${dir}
-    DESTINATION include/cpPlugins/Extensions
+    DESTINATION include/cpExtensions
     FILES_MATCHING PATTERN "*.h"
     )
   INSTALL(
     DIRECTORY ${dir}
-    DESTINATION include/cpPlugins/Extensions
+    DESTINATION include/cpExtensions
     FILES_MATCHING PATTERN "*.hxx"
     )
   INSTALL(
     DIRECTORY ${dir}
-    DESTINATION include/cpPlugins/Extensions
+    DESTINATION include/cpExtensions
     FILES_MATCHING PATTERN "*.hpp"
     )
 ENDFOREACH(dir)
 
 INSTALL(
   FILES
-  ${PROJECT_BINARY_DIR}/lib/cpPlugins/Extensions/${LIBRARY_NAME}_Export.h
-  DESTINATION include/cpPlugins/Extensions
+  ${PROJECT_BINARY_DIR}/lib/cpExtensions/${LIBRARY_NAME}_Export.h
+  DESTINATION include/cpExtensions
   )
 
 ## eof - $RCSfile$
similarity index 91%
rename from lib/cpPlugins/Extensions/DataStructures/ITKAndVTKImage.h
rename to lib/cpExtensions/DataStructures/ITKAndVTKImage.h
index 8a2953657bad6c3d6f3d988da006cbe92af11354..a3e2aacc03f4f9b5df69fcf51623e9b13832d8cc 100644 (file)
@@ -1,14 +1,12 @@
-#ifndef __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__ITKANDVTKIMAGE__H__
-#define __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__ITKANDVTKIMAGE__H__
+#ifndef __CPEXTENSIONS__DATASTRUCTURES__ITKANDVTKIMAGE__H__
+#define __CPEXTENSIONS__DATASTRUCTURES__ITKANDVTKIMAGE__H__
 
 #include <itkImage.h>
 #include <itkImageFileReader.h>
 #include <itkImageFileWriter.h>
 #include <itkImageToVTKImageFilter.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace DataStructures
     {
@@ -102,10 +100,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__ITKANDVTKIMAGE__H__
+#endif // __CPEXTENSIONS__DATASTRUCTURES__ITKANDVTKIMAGE__H__
 
 // eof - $RCSfile$
similarity index 98%
rename from lib/cpPlugins/Extensions/DataStructures/QuadEdge.h
rename to lib/cpExtensions/DataStructures/QuadEdge.h
index 70a63251d130e8b7d24a2230e6059bffcbf6a6bf..9b0a66048dacb8d0ac42c05a505a810910efd701 100644 (file)
@@ -1,12 +1,10 @@
-#ifndef __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGE__H__
-#define __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGE__H__
+#ifndef __CPEXTENSIONS__DATASTRUCTURES__QUADEDGE__H__
+#define __CPEXTENSIONS__DATASTRUCTURES__QUADEDGE__H__
 
 #include <itkLightObject.h>
-#include <cpPlugins/Extensions/DataStructures/QuadEdgeIterators.h>
+#include <cpExtensions/DataStructures/QuadEdgeIterators.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace DataStructures
     {
@@ -462,12 +460,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/DataStructures/QuadEdge.hxx>
+#include <cpExtensions/DataStructures/QuadEdge.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGE__H__
+#endif // __CPEXTENSIONS__DATASTRUCTURES__QUADEDGE__H__
 
 // eof - $RCSfile$
similarity index 80%
rename from lib/cpPlugins/Extensions/DataStructures/QuadEdge.hxx
rename to lib/cpExtensions/DataStructures/QuadEdge.hxx
index 6f7ff600e74ccd90144f70044173d15f17fb810c..a0e0e259b47494e86f4ba4a01995eae7e516d13b 100644 (file)
@@ -1,18 +1,18 @@
-#ifndef __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGE__HXX__
-#define __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGE__HXX__
+#ifndef __CPEXTENSIONS__DATASTRUCTURES__QUADEDGE__HXX__
+#define __CPEXTENSIONS__DATASTRUCTURES__QUADEDGE__HXX__
 
 #include <limits>
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-const typename cpPlugins::Extensions::DataStructures::
+const typename cpExtensions::DataStructures::
 QuadEdge< P, D, IsPrimal >::TPrimalGeometry
-cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 NoGeometry = std::numeric_limits< P >::max( );
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-void cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+void cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 CreateRings( )
 {
   TPrimal* e = this;
@@ -33,7 +33,7 @@ CreateRings( )
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-void cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+void cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 SetLnextRingGeometry( const D& v )
 {
   for( Iterator i = this->BeginLnext( ); i != this->EndLnext( ); ++i )
@@ -42,7 +42,7 @@ SetLnextRingGeometry( const D& v )
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-void cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+void cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 UnsetLnextRingGeometry( )
 {
   this->SetLnextRingGeometry( TDual::NoGeometry );
@@ -50,7 +50,7 @@ UnsetLnextRingGeometry( )
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-bool cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+bool cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 IsEdgeInOnextRing( const TPrimal* e ) const
 {
   bool found = false;
@@ -65,7 +65,7 @@ IsEdgeInOnextRing( const TPrimal* e ) const
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-bool cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+bool cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 IsEdgeInLnextRing( const TPrimal* e ) const
 {
   bool found = false;
@@ -81,7 +81,7 @@ IsEdgeInLnextRing( const TPrimal* e ) const
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
 unsigned int
-cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 GetOnextRingSize( ) const
 {
   unsigned int count = 0;
@@ -97,7 +97,7 @@ GetOnextRingSize( ) const
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
 unsigned int
-cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 GetLnextRingSize( ) const
 {
   unsigned int count = 0;
@@ -112,7 +112,7 @@ GetLnextRingSize( ) const
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-bool cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+bool cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 IsAtBorder( ) const
 {
   return(
@@ -123,7 +123,7 @@ IsAtBorder( ) const
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-bool cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+bool cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 IsOriginInternal( ) const
 {
   bool internal = true;
@@ -138,8 +138,8 @@ IsOriginInternal( ) const
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-typename cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
-TPrimal* cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+typename cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+TPrimal* cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 GetNextBorderEdgeWithUnsetLeft( TPrimal* edge ) const
 {
   // Be sure the Onext ring isn't already full
@@ -165,7 +165,7 @@ GetNextBorderEdgeWithUnsetLeft( TPrimal* edge ) const
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-bool cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+bool cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 ReorderOnextRing( TPrimal* first, TPrimal* second )
 {
   // Making sure point adjacency is correct:
@@ -197,7 +197,7 @@ ReorderOnextRing( TPrimal* first, TPrimal* second )
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-void cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+void cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 Splice( TPrimal* a, TPrimal* b )
 {
   // Don't waste time splicing the same edge (or non-existent)
@@ -221,7 +221,7 @@ Splice( TPrimal* a, TPrimal* b )
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 QuadEdge( )
   : m_Origin( Self::NoGeometry )
 {
@@ -231,11 +231,11 @@ QuadEdge( )
 
 // -------------------------------------------------------------------------
 template< typename P, typename D, bool IsPrimal >
-cpPlugins::Extensions::DataStructures::QuadEdge< P, D, IsPrimal >::
+cpExtensions::DataStructures::QuadEdge< P, D, IsPrimal >::
 ~QuadEdge( )
 {
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGE__HXX__
+#endif // __CPEXTENSIONS__DATASTRUCTURES__QUADEDGE__HXX__
 
 // eof - $RCSfile$
similarity index 93%
rename from lib/cpPlugins/Extensions/DataStructures/QuadEdgeCell.h
rename to lib/cpExtensions/DataStructures/QuadEdgeCell.h
index ed8558e7ea9e50a9f07e16ff5f4986efc48ebcc9..ff7e5a40a78ba5d40808c7488f7413566236ff16 100644 (file)
@@ -1,11 +1,9 @@
-#ifndef __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGECELL__H__
-#define __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGECELL__H__
+#ifndef __CPEXTENSIONS__DATASTRUCTURES__QUADEDGECELL__H__
+#define __CPEXTENSIONS__DATASTRUCTURES__QUADEDGECELL__H__
 
 #include <vector>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace DataStructures
     {
@@ -117,12 +115,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/DataStructures/QuadEdgeCell.hxx>
+#include <cpExtensions/DataStructures/QuadEdgeCell.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGECELL__H__
+#endif // __CPEXTENSIONS__DATASTRUCTURES__QUADEDGECELL__H__
 
 // eof - $RCSfile$
similarity index 70%
rename from lib/cpPlugins/Extensions/DataStructures/QuadEdgeCell.hxx
rename to lib/cpExtensions/DataStructures/QuadEdgeCell.hxx
index 9b6fbc322d7c422196551e1409a196bc3dd93c37..7713b3ea36c442f043f2f8bb7475530bc463216a 100644 (file)
@@ -1,9 +1,9 @@
-#ifndef __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGECELL__HXX__
-#define __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGECELL__HXX__
+#ifndef __CPEXTENSIONS__DATASTRUCTURES__QUADEDGECELL__HXX__
+#define __CPEXTENSIONS__DATASTRUCTURES__QUADEDGECELL__HXX__
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 QuadEdgeCell( )
   : Superclass( ),
     m_EntryEdge( NULL )
@@ -12,7 +12,7 @@ QuadEdgeCell( )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 QuadEdgeCell( E* entry )
   : Superclass( ),
     m_EntryEdge( entry )
@@ -22,15 +22,15 @@ QuadEdgeCell( E* entry )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 ~QuadEdgeCell( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
-CellGeometry cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+typename cpExtensions::DataStructures::QuadEdgeCell< I, E >::
+CellGeometry cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 GetType( ) const
 {
   std::cout << "QuadEdgeCell GetType" << std::endl;
@@ -39,7 +39,7 @@ GetType( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 MakeCopy( CellAutoPointer& other ) const
 {
   std::cout << "QuadEdgeCell MakeCopy" << std::endl;
@@ -48,7 +48,7 @@ MakeCopy( CellAutoPointer& other ) const
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-unsigned int cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+unsigned int cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 GetDimension( ) const
 {
   std::cout << "QuadEdgeCell GetDimension" << std::endl;
@@ -57,7 +57,7 @@ GetDimension( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-unsigned int cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+unsigned int cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 GetNumberOfPoints( ) const
 {
   return( this->m_EntryEdge->GetLnextRingSize( ) );
@@ -65,8 +65,8 @@ GetNumberOfPoints( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
-CellFeatureCount cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+typename cpExtensions::DataStructures::QuadEdgeCell< I, E >::
+CellFeatureCount cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 GetNumberOfBoundaryFeatures( int dimension ) const
 {
   std::cout << "QuadEdgeCell GetNumberOfBoundaryFeatures" << std::endl;
@@ -75,7 +75,7 @@ GetNumberOfBoundaryFeatures( int dimension ) const
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-bool cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+bool cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 GetBoundaryFeature(
   int dimension,
   CellFeatureIdentifier fId,
@@ -88,7 +88,7 @@ GetBoundaryFeature(
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 SetPointIds( PointIdConstIterator first )
 {
   std::cout << "QuadEdgeCell SetPointIds" << std::endl;
@@ -97,7 +97,7 @@ SetPointIds( PointIdConstIterator first )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 SetPointIds(
   PointIdConstIterator first,
   PointIdConstIterator last
@@ -109,7 +109,7 @@ SetPointIds(
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 AddPointId( PointIdentifier pId )
 {
   std::cout << "QuadEdgeCell AddPointId" << std::endl;
@@ -118,7 +118,7 @@ AddPointId( PointIdentifier pId )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 RemovePointId( PointIdentifier pId )
 {
   std::cout << "QuadEdgeCell RemovePointId" << std::endl;
@@ -127,7 +127,7 @@ RemovePointId( PointIdentifier pId )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 SetPointIds(
   int dummy,
   int num,
@@ -140,7 +140,7 @@ SetPointIds(
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 BuildEdges( )
 {
   std::cout << "QuadEdgeCell BuildEdges" << std::endl;
@@ -149,7 +149,7 @@ BuildEdges( )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 ClearPoints( )
 {
   std::cout << "QuadEdgeCell ClearPoints" << std::endl;
@@ -158,7 +158,7 @@ ClearPoints( )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 SetPointId( int localId, PointIdentifier pId )
 {
   std::cout << "QuadEdgeCell SetPointId(localId,pId)" << std::endl;
@@ -167,7 +167,7 @@ SetPointId( int localId, PointIdentifier pId )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-int cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+int cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 GetTopologyId( )
 {
   // TODO: return( Superclass::POLYGON_CELL );
@@ -177,7 +177,7 @@ GetTopologyId( )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 Accept(
   CellIdentifier cellid,
   typename itk::CellInterface< PixelType, CellTraits >::MultiVisitor* mv
@@ -189,8 +189,8 @@ Accept(
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
-PointIdIterator cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+typename cpExtensions::DataStructures::QuadEdgeCell< I, E >::
+PointIdIterator cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 PointIdsBegin( )
 {
   std::cout << "QuadEdgeCell PointIdsBegin" << std::endl;
@@ -199,9 +199,9 @@ PointIdsBegin( )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+typename cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 PointIdConstIterator
-cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 PointIdsBegin( ) const
 {
   std::cout << "QuadEdgeCell PointIdsBegin (const)" << std::endl;
@@ -210,8 +210,8 @@ PointIdsBegin( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
-PointIdIterator cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+typename cpExtensions::DataStructures::QuadEdgeCell< I, E >::
+PointIdIterator cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 PointIdsEnd( )
 {
   std::cout << "QuadEdgeCell PointIdsEnd" << std::endl;
@@ -220,9 +220,9 @@ PointIdsEnd( )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+typename cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 PointIdConstIterator
-cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 PointIdsEnd( ) const
 {
   std::cout << "QuadEdgeCell PointIdsEnd (const)" << std::endl;
@@ -231,7 +231,7 @@ PointIdsEnd( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-E* cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+E* cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 GetEntryPrimalEdge( )
 {
   return( this->m_EntryEdge );
@@ -239,7 +239,7 @@ GetEntryPrimalEdge( )
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-const E* cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+const E* cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 GetEntryPrimalEdge( ) const
 {
   return( this->m_EntryEdge );
@@ -247,12 +247,12 @@ GetEntryPrimalEdge( ) const
 
 // -------------------------------------------------------------------------
 template< class I, class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeCell< I, E >::
+void cpExtensions::DataStructures::QuadEdgeCell< I, E >::
 SetEntryPrimalEdge( E* entry )
 {
   this->m_EntryEdge = entry;
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGECELL__HXX__
+#endif // __CPEXTENSIONS__DATASTRUCTURES__QUADEDGECELL__HXX__
 
 // eof - $RCSfile$
similarity index 93%
rename from lib/cpPlugins/Extensions/DataStructures/QuadEdgeIterators.h
rename to lib/cpExtensions/DataStructures/QuadEdgeIterators.h
index 7ba20f075eeb62e1da5b62acae631ff392f06888..9f0973b1b5165c37143b0e9f4f86f679cad757d7 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__H__
-#define __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__H__
+#ifndef __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__H__
+#define __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__H__
 
 #include <cstdlib>
 
@@ -30,9 +30,7 @@
   cpPluginsQEIteratorsMacro( op, Iterator, ConstIterator );             \
   cpPluginsExtensionsQEPointIteratorsMacro( op, Iterator, ConstIterator );
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace DataStructures
     {
@@ -164,12 +162,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/DataStructures/QuadEdgeIterators.hxx>
+#include <cpExtensions/DataStructures/QuadEdgeIterators.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__H__
+#endif // __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__H__
 
 // eof - $RCSfile$
similarity index 71%
rename from lib/cpPlugins/Extensions/DataStructures/QuadEdgeIterators.hxx
rename to lib/cpExtensions/DataStructures/QuadEdgeIterators.hxx
index 874292fc4902edd5e79ae00290bb7b6eefa4d635..3255e0dab881456ba9057e8af112231fde12765c 100644 (file)
@@ -1,9 +1,9 @@
-#ifndef __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__HXX__
-#define __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__HXX__
+#ifndef __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__HXX__
+#define __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__HXX__
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 QuadEdgeBaseIterator( E* e, int op, bool start )
   : m_StartEdge( e ),
     m_Iterator( e ),
@@ -14,15 +14,15 @@ QuadEdgeBaseIterator( E* e, int op, bool start )
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 ~QuadEdgeBaseIterator( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class E >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
-Self& cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+typename cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
+Self& cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 operator=( const Self& r )
 {
   if( this != &r )
@@ -38,7 +38,7 @@ operator=( const Self& r )
 
 // -------------------------------------------------------------------------
 template< class E >
-E* cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+E* cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 GetStartEdge( ) const
 {
   return( this->m_StartEdge );
@@ -46,7 +46,7 @@ GetStartEdge( ) const
 
 // -------------------------------------------------------------------------
 template< class E >
-E* cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+E* cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 GetIterator( ) const
 {
   return( this->m_Iterator );
@@ -54,7 +54,7 @@ GetIterator( ) const
 
 // -------------------------------------------------------------------------
 template< class E >
-int cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+int cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 GetOpType( ) const
 {
   return( this->m_OpType );
@@ -62,7 +62,7 @@ GetOpType( ) const
 
 // -------------------------------------------------------------------------
 template< class E >
-bool cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+bool cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 GetStart( ) const
 {
   return( this->m_Start );
@@ -70,7 +70,7 @@ GetStart( ) const
 
 // -------------------------------------------------------------------------
 template< class E >
-bool cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+bool cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 operator==( Self& r )
 {
   return(
@@ -83,7 +83,7 @@ operator==( Self& r )
 
 // -------------------------------------------------------------------------
 template< class E >
-bool cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+bool cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 operator==( const Self& r ) const
 {
   return(
@@ -96,7 +96,7 @@ operator==( const Self& r ) const
 
 // -------------------------------------------------------------------------
 template< class E >
-bool cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+bool cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 operator!=( Self& r )
 {
   return( !( this->operator==( r ) ) );
@@ -104,7 +104,7 @@ operator!=( Self& r )
 
 // -------------------------------------------------------------------------
 template< class E >
-bool cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+bool cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 operator!=( const Self& r ) const
 {
   return( !( this->operator==( r ) ) );
@@ -112,8 +112,8 @@ operator!=( const Self& r ) const
 
 // -------------------------------------------------------------------------
 template< class E >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
-Self& cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+typename cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
+Self& cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 operator++( )
 {
   if( this->m_Start )
@@ -127,8 +127,8 @@ operator++( )
 
 // -------------------------------------------------------------------------
 template< class E >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
-Self& cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+typename cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
+Self& cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 operator++( int )
 {
   if( this->m_Start )
@@ -142,7 +142,7 @@ operator++( int )
 
 // -------------------------------------------------------------------------
 template< class E >
-void cpPlugins::Extensions::DataStructures::QuadEdgeBaseIterator< E >::
+void cpExtensions::DataStructures::QuadEdgeBaseIterator< E >::
 _GoToNext( )
 {
   switch( this->m_OpType )
@@ -178,7 +178,7 @@ _GoToNext( )
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgeIterator< E >::
+cpExtensions::DataStructures::QuadEdgeIterator< E >::
 QuadEdgeIterator( E* e, int op, bool start )
   : Superclass( e, op, start )
 {
@@ -186,14 +186,14 @@ QuadEdgeIterator( E* e, int op, bool start )
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgeIterator< E >::
+cpExtensions::DataStructures::QuadEdgeIterator< E >::
 ~QuadEdgeIterator( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class E >
-E* cpPlugins::Extensions::DataStructures::QuadEdgeIterator< E >::
+E* cpExtensions::DataStructures::QuadEdgeIterator< E >::
 operator*( )
 {
   return( this->m_Iterator );
@@ -201,7 +201,7 @@ operator*( )
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgeConstIterator< E >::
+cpExtensions::DataStructures::QuadEdgeConstIterator< E >::
 QuadEdgeConstIterator( const E* e, int op, bool start )
   : Superclass( e, op, start )
 {
@@ -209,14 +209,14 @@ QuadEdgeConstIterator( const E* e, int op, bool start )
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgeConstIterator< E >::
+cpExtensions::DataStructures::QuadEdgeConstIterator< E >::
 ~QuadEdgeConstIterator( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class E >
-const E* cpPlugins::Extensions::DataStructures::QuadEdgeConstIterator< E >::
+const E* cpExtensions::DataStructures::QuadEdgeConstIterator< E >::
 operator*( ) const
 {
   return( this->m_Iterator );
@@ -224,7 +224,7 @@ operator*( ) const
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgePointIterator< E >::
+cpExtensions::DataStructures::QuadEdgePointIterator< E >::
 QuadEdgePointIterator( const E* e, int op, bool start )
   : Superclass( e, op, start )
 {
@@ -232,7 +232,7 @@ QuadEdgePointIterator( const E* e, int op, bool start )
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgePointIterator< E >::
+cpExtensions::DataStructures::QuadEdgePointIterator< E >::
 ~QuadEdgePointIterator( )
 {
 }
@@ -240,7 +240,7 @@ cpPlugins::Extensions::DataStructures::QuadEdgePointIterator< E >::
 // -------------------------------------------------------------------------
 template< class E >
 typename E::TPrimalGeometry&
-cpPlugins::Extensions::DataStructures::QuadEdgePointIterator< E >::
+cpExtensions::DataStructures::QuadEdgePointIterator< E >::
 operator*( )
 {
   return( this->m_Iterator->GetOrigin( ) );
@@ -248,7 +248,7 @@ operator*( )
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgePointConstIterator< E >::
+cpExtensions::DataStructures::QuadEdgePointConstIterator< E >::
 QuadEdgePointConstIterator( const E* e, int op, bool start )
   : Superclass( e, op, start )
 {
@@ -256,7 +256,7 @@ QuadEdgePointConstIterator( const E* e, int op, bool start )
 
 // -------------------------------------------------------------------------
 template< class E >
-cpPlugins::Extensions::DataStructures::QuadEdgePointConstIterator< E >::
+cpExtensions::DataStructures::QuadEdgePointConstIterator< E >::
 ~QuadEdgePointConstIterator( )
 {
 }
@@ -264,12 +264,12 @@ cpPlugins::Extensions::DataStructures::QuadEdgePointConstIterator< E >::
 // -------------------------------------------------------------------------
 template< class E >
 const typename E::TPrimalGeometry&
-cpPlugins::Extensions::DataStructures::QuadEdgePointConstIterator< E >::
+cpExtensions::DataStructures::QuadEdgePointConstIterator< E >::
 operator*( ) const
 {
   return( this->m_Iterator->GetOrigin( ) );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__HXX__
+#endif // __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEITERATORS__HXX__
 
 // eof - $RCSfile$
similarity index 95%
rename from lib/cpPlugins/Extensions/DataStructures/QuadEdgeMesh.h
rename to lib/cpExtensions/DataStructures/QuadEdgeMesh.h
index c93d4658d8dbe3dd7825fd495d590931e0b022b7..977bc5d0e9db222f987db9bb882d93d8fa6d54fe 100644 (file)
@@ -1,16 +1,14 @@
-#ifndef __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__H__
-#define __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__H__
+#ifndef __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__H__
+#define __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__H__
 
 #include <set>
 #include <vector>
 
 #include <itkMesh.h>
-#include <cpPlugins/Extensions/DataStructures/QuadEdgeCell.h>
-#include <cpPlugins/Extensions/DataStructures/QuadEdge.h>
+#include <cpExtensions/DataStructures/QuadEdgeCell.h>
+#include <cpExtensions/DataStructures/QuadEdge.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace DataStructures
     {
@@ -276,12 +274,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/DataStructures/QuadEdgeMesh.hxx>
+#include <cpExtensions/DataStructures/QuadEdgeMesh.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__H__
+#endif // __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__H__
 
 // eof - $RCSfile$
similarity index 83%
rename from lib/cpPlugins/Extensions/DataStructures/QuadEdgeMesh.hxx
rename to lib/cpExtensions/DataStructures/QuadEdgeMesh.hxx
index 5fd57d63521657bcdf9527c0ea42e6166091ab94..e4c5eff39b80caa279357f975bad6ee17b45ffbb 100644 (file)
@@ -1,10 +1,10 @@
-#ifndef __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__HXX__
-#define __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__HXX__
+#ifndef __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__HXX__
+#define __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__HXX__
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
-TPrimalEdge* cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+typename cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
+TPrimalEdge* cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 FindEdge( const PointIdentifier& a ) const
 {
   if( a < this->m_OnextRings.size( ) )
@@ -15,8 +15,8 @@ FindEdge( const PointIdentifier& a ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
-TPrimalEdge* cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+typename cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
+TPrimalEdge* cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 FindEdge( const PointIdentifier& a, const PointIdentifier& b ) const
 {
   TPrimalEdge* found = NULL;
@@ -34,8 +34,8 @@ FindEdge( const PointIdentifier& a, const PointIdentifier& b ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
-TPrimalEdge* cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+typename cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
+TPrimalEdge* cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 FindEntryEdge( const CellIdentifier& i ) const
 {
   if( i < this->GetNumberOfCells( ) )
@@ -55,8 +55,8 @@ FindEntryEdge( const CellIdentifier& i ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-const typename cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
-CntNormals& cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+const typename cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
+CntNormals& cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 GetPointNormalsContainer( ) const
 {
   return( this->m_PointNormals );
@@ -64,8 +64,8 @@ GetPointNormalsContainer( ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
-NormalsIterator cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+typename cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
+NormalsIterator cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 BeginPointNormals( ) const
 {
   return( this->m_PointNormals.begin( ) );
@@ -73,8 +73,8 @@ BeginPointNormals( ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
-NormalsIterator cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+typename cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
+NormalsIterator cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 EndPointNormals( ) const
 {
   return( this->m_PointNormals.end( ) );
@@ -82,8 +82,8 @@ EndPointNormals( ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-const typename cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
-VectorType& cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+const typename cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
+VectorType& cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 GetPointNormal( const PointIdentifier& id ) const
 {
   static const VectorType zero( TScalar( 0 ) );
@@ -95,7 +95,7 @@ GetPointNormal( const PointIdentifier& id ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-bool cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+bool cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 RequestedRegionIsOutsideOfTheBufferedRegion( )
 {
   // Mesh regions don't have meaning with QuadEdges, this is important
@@ -105,7 +105,7 @@ RequestedRegionIsOutsideOfTheBufferedRegion( )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 SetPoints( PointsContainer* points )
 {
   this->_ReleaseQuadEdgeObjects( );
@@ -118,7 +118,7 @@ SetPoints( PointsContainer* points )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 SetPoint( PointIdentifier id , PointType point )
 {
   // If the point is brand new, add some non-existent edges and normals
@@ -137,7 +137,7 @@ SetPoint( PointIdentifier id , PointType point )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 Initialize( )
 {
   this->Superclass::Initialize( );
@@ -146,7 +146,7 @@ Initialize( )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 Graft( const itk::DataObject* data )
 {
   this->Superclass::Graft( data );
@@ -164,7 +164,7 @@ Graft( const itk::DataObject* data )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 SetCells( CellsContainer* cells )
 {
   // Clear cells
@@ -188,7 +188,7 @@ SetCells( CellsContainer* cells )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 SetCellData( CellDataContainer* data )
 {
   /* TODO
@@ -199,7 +199,7 @@ SetCellData( CellDataContainer* data )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 SetCell( CellIdentifier id, CellAutoPointer& ptr )
 {
   // Overwrite an existing cell?
@@ -252,7 +252,7 @@ SetCell( CellIdentifier id, CellAutoPointer& ptr )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 SetCellData( CellIdentifier id, CellPixelType data )
 {
   /* TODO
@@ -263,7 +263,7 @@ SetCellData( CellIdentifier id, CellPixelType data )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 BuildCellLinks( ) const
 {
   // This is no longer required when using QuadEdges
@@ -271,7 +271,7 @@ BuildCellLinks( ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 QuadEdgeMesh( )
   : Superclass( )
 {
@@ -280,7 +280,7 @@ QuadEdgeMesh( )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 ~QuadEdgeMesh( )
 {
   this->_ReleaseQuadEdgeObjects( );
@@ -288,7 +288,7 @@ cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-bool cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+bool cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 _CheckPoints( const CellAutoPointer& ptr ) const
 {
   const typename Superclass::PointsContainer* pnts = this->GetPoints( );
@@ -302,7 +302,7 @@ _CheckPoints( const CellAutoPointer& ptr ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 _DeletePoint( const PointIdentifier& pId )
 {
   PointIdentifier lastId = this->GetNumberOfPoints( ) - 1;
@@ -332,8 +332,8 @@ _DeletePoint( const PointIdentifier& pId )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
-TPrimalEdge* cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+typename cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
+TPrimalEdge* cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 _CreateQuadEdge( const PointIdentifier& a, const PointIdentifier& b )
 {
   // Create brand new object
@@ -355,7 +355,7 @@ _CreateQuadEdge( const PointIdentifier& a, const PointIdentifier& b )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 _DeleteEdge( TPrimalEdge* edge )
 {
   this->m_DualEdges.erase( edge->GetInvRot( ) );
@@ -366,7 +366,7 @@ _DeleteEdge( TPrimalEdge* edge )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 _DeleteFace( const CellIdentifier& f )
 {
   unsigned long cellId = this->GetNumberOfCells( ) - 1;
@@ -389,7 +389,7 @@ _DeleteFace( const CellIdentifier& f )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 _ConstructEdges( _TEdges& edges, const CellAutoPointer& ptr )
 {
   edges.clear( );
@@ -474,8 +474,8 @@ _ConstructEdges( _TEdges& edges, const CellAutoPointer& ptr )
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-typename cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
-VectorType cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+typename cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
+VectorType cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 _ComputePointNormal( const TPrimalEdge* e ) const
 {
   VectorType n( TScalar( 0 ) );
@@ -513,7 +513,7 @@ _ComputePointNormal( const TPrimalEdge* e ) const
 
 // -------------------------------------------------------------------------
 template< typename P, unsigned int D, typename T >
-void cpPlugins::Extensions::DataStructures::QuadEdgeMesh< P, D, T >::
+void cpExtensions::DataStructures::QuadEdgeMesh< P, D, T >::
 _ReleaseQuadEdgeObjects( )
 {
   this->m_PrimalEdges.clear( );
@@ -522,6 +522,6 @@ _ReleaseQuadEdgeObjects( )
   this->m_PointNormals.clear( );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__HXX__
+#endif // __CPEXTENSIONS__DATASTRUCTURES__QUADEDGEMESH__HXX__
 
 // eof - $RCSfile$
similarity index 81%
rename from lib/cpPlugins/Extensions/IO/MeshReader.h
rename to lib/cpExtensions/IO/MeshReader.h
index 2e75bf337294761fb8b4e41aafabb3628e79716b..94880a9644f67ed4f0065128a62e0eb9dc84a9d5 100644 (file)
@@ -1,12 +1,10 @@
-#ifndef __CPPLUGINS__EXTENSIONS__IO__MESHREADER__H__
-#define __CPPLUGINS__EXTENSIONS__IO__MESHREADER__H__
+#ifndef __CPEXTENSIONS__IO__MESHREADER__H__
+#define __CPEXTENSIONS__IO__MESHREADER__H__
 
 #include <string>
 #include <itkMeshSource.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace IO
     {
@@ -55,12 +53,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/IO/MeshReader.hxx>
+#include <cpExtensions/IO/MeshReader.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__IO__MESHREADER__H__
+#endif // __CPEXTENSIONS__IO__MESHREADER__H__
 
 // eof - $RCSfile$
similarity index 76%
rename from lib/cpPlugins/Extensions/IO/MeshReader.hxx
rename to lib/cpExtensions/IO/MeshReader.hxx
index 26cd268a207e1d433bfdcc46a473c15ce6f35eb1..8146e6e92a736b02558838a306040f730991048f 100644 (file)
@@ -1,13 +1,13 @@
-#ifndef __CPPLUGINS__EXTENSIONS__IO__MESHREADER__HXX__
-#define __CPPLUGINS__EXTENSIONS__IO__MESHREADER__HXX__
+#ifndef __CPEXTENSIONS__IO__MESHREADER__HXX__
+#define __CPEXTENSIONS__IO__MESHREADER__HXX__
 
 #include <algorithm>
-#include <cpPlugins/Extensions/IO/WaveFrontOBJReader.h>
+#include <cpExtensions/IO/WaveFrontOBJReader.h>
 #include <itkVTKPolyDataReader.h>
 
 // -------------------------------------------------------------------------
 template< typename M >
-itk::ModifiedTimeType cpPlugins::Extensions::IO::MeshReader< M >::
+itk::ModifiedTimeType cpExtensions::IO::MeshReader< M >::
 GetMTime( ) const
 {
   itk::ModifiedTimeType mtime = this->Superclass::GetMTime( );
@@ -22,7 +22,7 @@ GetMTime( ) const
 
 // -------------------------------------------------------------------------
 template< typename M >
-cpPlugins::Extensions::IO::MeshReader< M >::
+cpExtensions::IO::MeshReader< M >::
 MeshReader( )
   : Superclass( )
 {
@@ -30,14 +30,14 @@ MeshReader( )
 
 // -------------------------------------------------------------------------
 template< typename M >
-cpPlugins::Extensions::IO::MeshReader< M >::
+cpExtensions::IO::MeshReader< M >::
 ~MeshReader( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< typename M >
-void cpPlugins::Extensions::IO::MeshReader< M >::
+void cpExtensions::IO::MeshReader< M >::
 GenerateData( )
 {
   std::string fn = this->m_FileName;
@@ -45,13 +45,13 @@ GenerateData( )
   if( fn.rfind( ".vtk" ) != std::string::npos )
     this->_Read< itk::VTKPolyDataReader< M > >( );
   else if( fn.rfind( ".obj" ) != std::string::npos )
-    this->_Read< cpPlugins::Extensions::IO::WaveFrontOBJReader< M > >( );
+    this->_Read< cpExtensions::IO::WaveFrontOBJReader< M > >( );
 }
 
 // -------------------------------------------------------------------------
 template< typename M >
 template< class R >
-void cpPlugins::Extensions::IO::MeshReader< M >::
+void cpExtensions::IO::MeshReader< M >::
 _Read( )
 {
   typename R::Pointer reader = NULL;
@@ -87,6 +87,6 @@ _Read( )
   } // fi
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__IO__MESHREADER__HXX__
+#endif // __CPEXTENSIONS__IO__MESHREADER__HXX__
 
 // eof - $RCSfile$
similarity index 88%
rename from lib/cpPlugins/Extensions/IO/WaveFrontOBJReader.h
rename to lib/cpExtensions/IO/WaveFrontOBJReader.h
index 8d619c7d1fbad46dbd118c471e34b0cdff401e4d..9ce320d19b90f37a2bf4d355d9bc1f9c1a6ce9cb 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __CPPLUGINS__EXTENSIONS__IO__WAVEFRONTOBJREADER__H__
-#define __CPPLUGINS__EXTENSIONS__IO__WAVEFRONTOBJREADER__H__
+#ifndef __CPEXTENSIONS__IO__WAVEFRONTOBJREADER__H__
+#define __CPEXTENSIONS__IO__WAVEFRONTOBJREADER__H__
 
 #include <string>
 #include <itkIntTypes.h>
@@ -7,9 +7,7 @@
 #include <itkMeshSource.h>
 #include <itkPolygonCell.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace IO
     {
@@ -72,12 +70,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/IO/WaveFrontOBJReader.hxx>
+#include <cpExtensions/IO/WaveFrontOBJReader.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__IO__WAVEFRONTOBJREADER__H__
+#endif // __CPEXTENSIONS__IO__WAVEFRONTOBJREADER__H__
 
 // eof - $RCSfile$
similarity index 88%
rename from lib/cpPlugins/Extensions/IO/WaveFrontOBJReader.hxx
rename to lib/cpExtensions/IO/WaveFrontOBJReader.hxx
index 2e10b012a70b86bab7379fca6dd086f43d565ee3..94db473d2a7084c04bfdc5aff3290a603d07af26 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __CPPLUGINS__EXTENSIONS__IO__WAVEFRONTOBJREADER__HXX__
-#define __CPPLUGINS__EXTENSIONS__IO__WAVEFRONTOBJREADER__HXX__
+#ifndef __CPEXTENSIONS__IO__WAVEFRONTOBJREADER__HXX__
+#define __CPEXTENSIONS__IO__WAVEFRONTOBJREADER__HXX__
 
 #include <cstdlib>
 #include <fstream>
@@ -7,7 +7,7 @@
 
 // -------------------------------------------------------------------------
 template< typename M >
-cpPlugins::Extensions::IO::WaveFrontOBJReader< M >::
+cpExtensions::IO::WaveFrontOBJReader< M >::
 WaveFrontOBJReader( )
   : Superclass( )
 {
@@ -15,14 +15,14 @@ WaveFrontOBJReader( )
 
 // -------------------------------------------------------------------------
 template< typename M >
-cpPlugins::Extensions::IO::WaveFrontOBJReader< M >::
+cpExtensions::IO::WaveFrontOBJReader< M >::
 ~WaveFrontOBJReader( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< typename M >
-void cpPlugins::Extensions::IO::WaveFrontOBJReader< M >::
+void cpExtensions::IO::WaveFrontOBJReader< M >::
 GenerateData( )
 {
   typedef typename PointType::ValueType TScalar;
@@ -118,6 +118,6 @@ GenerateData( )
   in.close( );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__IO__WAVEFRONTOBJREADER__HXX__
+#endif // __CPEXTENSIONS__IO__WAVEFRONTOBJREADER__HXX__
 
 // eof - $RCSfile$
similarity index 91%
rename from lib/cpPlugins/Extensions/Visualization/Image3DMPR.cxx
rename to lib/cpExtensions/Visualization/Image3DMPR.cxx
index 9d312989a002d0fd19ccd1ef15f82b5aceb766ac..86225b56c25560efa9ec2a9eb2b171711993bc26 100644 (file)
@@ -1,9 +1,9 @@
-#include <cpPlugins/Extensions/Visualization/Image3DMPR.h>
+#include <cpExtensions/Visualization/Image3DMPR.h>
 
 #include <vtkCommand.h>
 #include <vtkInteractorStyleSwitch.h>
 
-#include <cpPlugins/Extensions/Visualization/SeedWidgetCorrector.h>
+#include <cpExtensions/Visualization/SeedWidgetCorrector.h>
 
 /**
  */
@@ -73,7 +73,7 @@ public:
 };
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::Image3DMPR::
+cpExtensions::Visualization::Image3DMPR::
 Image3DMPR( )
 {
   this->m_Outline = vtkSmartPointer< vtkOutlineSource >::New( );
@@ -114,7 +114,7 @@ Image3DMPR( )
   this->m_Interactor->AddObserver( vtkCommand::KeyPressEvent, int_cb );
 
   typedef
-    cpPlugins::Extensions::Visualization::SeedWidgetCorrector
+    cpExtensions::Visualization::SeedWidgetCorrector
     _TCorrector;
   vtkSmartPointer< _TCorrector > corr_cb =
     vtkSmartPointer< _TCorrector >::New( );
@@ -123,13 +123,13 @@ Image3DMPR( )
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::Image3DMPR::
+cpExtensions::Visualization::Image3DMPR::
 ~Image3DMPR( )
 {
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 SetImage( vtkImageData* image )
 {
   this->m_Image = image;
@@ -214,21 +214,21 @@ SetImage( vtkImageData* image )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 SetBackground( double r, double g, double b )
 {
   this->m_Renderer->SetBackground( r, g, b );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 SetSize( unsigned int w, unsigned int h )
 {
   this->m_Window->SetSize( w, h );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 SetWindowLevel( double w, double l )
 {
   this->m_WidgetX->SetWindowLevel( w, l );
@@ -237,7 +237,7 @@ SetWindowLevel( double w, double l )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 AddPolyData( vtkPolyData* pd, double opacity )
 {
   unsigned int i = this->m_PolyDatas.size( );
@@ -255,7 +255,7 @@ AddPolyData( vtkPolyData* pd, double opacity )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 AddPolyData( vtkPolyData* pd, double r, double g, double b, double opacity )
 {
   unsigned int i = this->m_PolyDatas.size( );
@@ -275,7 +275,7 @@ AddPolyData( vtkPolyData* pd, double r, double g, double b, double opacity )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 AddPolyData( vtkPolyData* pd, vtkLookupTable* lut, double opacity )
 {
   unsigned int i = this->m_PolyDatas.size( );
@@ -292,14 +292,14 @@ AddPolyData( vtkPolyData* pd, vtkLookupTable* lut, double opacity )
 }
 
 // -------------------------------------------------------------------------
-unsigned int cpPlugins::Extensions::Visualization::Image3DMPR::
+unsigned int cpExtensions::Visualization::Image3DMPR::
 GetNumberOfSeeds( ) const
 {
   return( this->m_SeedRepresentation->GetNumberOfSeeds( ) );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 GetSeed( int n, double* s ) const
 {
   vtkHandleWidget* hWdg = this->m_SeedWidget->GetSeed( n );
@@ -313,7 +313,7 @@ GetSeed( int n, double* s ) const
 }
 
 // -------------------------------------------------------------------------
-unsigned int cpPlugins::Extensions::Visualization::Image3DMPR::
+unsigned int cpExtensions::Visualization::Image3DMPR::
 AddSeed( const double& x, const double& y, const double& z ) const
 {
   double pos[ 3 ] = { x, y, z };
@@ -328,21 +328,21 @@ AddSeed( const double& x, const double& y, const double& z ) const
 }
 
 // -------------------------------------------------------------------------
-vtkRenderWindow* cpPlugins::Extensions::Visualization::Image3DMPR::
+vtkRenderWindow* cpExtensions::Visualization::Image3DMPR::
 GetWindow( ) const
 {
   return( this->m_Window );
 }
 
 // -------------------------------------------------------------------------
-vtkRenderer* cpPlugins::Extensions::Visualization::Image3DMPR::
+vtkRenderer* cpExtensions::Visualization::Image3DMPR::
 GetRenderer( ) const
 {
   return( this->m_Renderer );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 Start( )
 {
   this->m_WidgetX->On( );
@@ -355,7 +355,7 @@ Start( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::Image3DMPR::
+void cpExtensions::Visualization::Image3DMPR::
 Render( )
 {
   this->m_Window->Render( );
similarity index 88%
rename from lib/cpPlugins/Extensions/Visualization/Image3DMPR.h
rename to lib/cpExtensions/Visualization/Image3DMPR.h
index bc9b22776323b8ee0cad951a74a0beb7f1ef59fb..37240a7a7019bcaaa2c3140fd9505c5072bce369 100644 (file)
@@ -1,7 +1,7 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__IMAGE3DMPR__H__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__IMAGE3DMPR__H__
+#ifndef __CPEXTENSIONS__VISUALIZATION__IMAGE3DMPR__H__
+#define __CPEXTENSIONS__VISUALIZATION__IMAGE3DMPR__H__
 
-#include <cpPlugins/Extensions/cpPlugins_Extensions_Export.h>
+#include <cpExtensions/cpExtensions_Export.h>
 
 #include <vtkActor.h>
 #include <vtkCellPicker.h>
 #include <vtkSphereSource.h>
 #include <vtkLookupTable.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Visualization
     {
       /**
        */
-      class cpPlugins_Extensions_EXPORT Image3DMPR
+      class cpExtensions_EXPORT Image3DMPR
       {
       public:
         Image3DMPR( );
@@ -90,10 +88,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__VISUALIZATION__IMAGE3DMPR__H__
+#endif // __CPEXTENSIONS__VISUALIZATION__IMAGE3DMPR__H__
 
 // eof - $RCSfile$
similarity index 88%
rename from lib/cpPlugins/Extensions/Visualization/ImageInteractorStyle.cxx
rename to lib/cpExtensions/Visualization/ImageInteractorStyle.cxx
index ee8ee26c8fdaa3bd944d7958e46784195d7337d7..33999255c599b996c779e59c2fd5f556d4a3da09 100644 (file)
@@ -1,4 +1,4 @@
-#include <cpPlugins/Extensions/Visualization/ImageInteractorStyle.h>
+#include <cpExtensions/Visualization/ImageInteractorStyle.h>
 
 #include <cmath>
 #include <ctime>
 #include <vtkRenderWindow.h>
 #include <vtkRenderWindowInteractor.h>
 
-#include <cpPlugins/Extensions/Visualization/ImageSliceActors.h>
-#include <cpPlugins/Extensions/Visualization/MPRActors.h>
+#include <cpExtensions/Visualization/ImageSliceActors.h>
+#include <cpExtensions/Visualization/MPRActors.h>
 
 // -------------------------------------------------------------------------
-const int cpPlugins::Extensions::Visualization::
+const int cpExtensions::Visualization::
 ImageInteractorStyle::CursorEvent = vtkCommand::UserEvent + 1;
-const int cpPlugins::Extensions::Visualization::
+const int cpExtensions::Visualization::
 ImageInteractorStyle::RadiusEvent = vtkCommand::UserEvent + 2;
-const int cpPlugins::Extensions::Visualization::
+const int cpExtensions::Visualization::
 ImageInteractorStyle::DoubleClickEvent = vtkCommand::UserEvent + 3;
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::ImageInteractorStyle::
-Self* cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+cpExtensions::Visualization::ImageInteractorStyle::
+Self* cpExtensions::Visualization::ImageInteractorStyle::
 New( )
 {
   return( new Self( ) );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 Configure( ImageSliceActors* slice_actors, MPRActors* mpr_actors )
 {
   this->m_SliceActors = slice_actors;
@@ -47,7 +47,7 @@ Configure( ImageSliceActors* slice_actors, MPRActors* mpr_actors )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 AssociateInteractor( vtkRenderWindowInteractor* interactor )
 {
   if( interactor != NULL )
@@ -59,21 +59,21 @@ AssociateInteractor( vtkRenderWindowInteractor* interactor )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 SetModeToNavigation( )
 {
   this->Mode = Self::NavigationMode;
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 SetModeToDeformation( )
 {
   this->Mode = Self::DeformationMode;
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 SetInteractor( vtkRenderWindowInteractor* interactor, const int& axis )
 {
   this->Superclass::SetInteractor( interactor );
@@ -118,7 +118,7 @@ SetInteractor( vtkRenderWindowInteractor* interactor, const int& axis )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnMouseMove( )
 {
   if( this->m_MPRActors == NULL )
@@ -167,7 +167,7 @@ OnMouseMove( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnLeftButtonDown( )
 {
   static double pnt[ 3 ];
@@ -199,7 +199,7 @@ OnLeftButtonDown( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnLeftButtonUp( )
 {
   if( this->CursorMoving )
@@ -212,7 +212,7 @@ OnLeftButtonUp( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnMiddleButtonDown( )
 {
   int x = this->Interactor->GetEventPosition( )[ 0 ];
@@ -238,7 +238,7 @@ OnMiddleButtonDown( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnMiddleButtonUp( )
 {
   if( this->RadiusMoving )
@@ -260,7 +260,7 @@ OnMiddleButtonUp( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnRightButtonDown( )
 {
   int x = this->Interactor->GetEventPosition( )[ 0 ];
@@ -285,7 +285,7 @@ OnRightButtonDown( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnRightButtonUp( )
 {
   switch( this->State )
@@ -304,7 +304,7 @@ OnRightButtonUp( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnMouseWheelForward( )
 {
   if( this->m_SliceActors == NULL || this->Interactor == NULL )
@@ -320,7 +320,7 @@ OnMouseWheelForward( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnMouseWheelBackward( )
 {
   if( this->m_SliceActors == NULL || this->Interactor == NULL )
@@ -336,7 +336,7 @@ OnMouseWheelBackward( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 OnChar( )
 {
   switch( this->Interactor->GetKeyCode( ) )
@@ -366,7 +366,7 @@ OnChar( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 WindowLevel( )
 {
   if( this->Mode == Self::NavigationMode )
@@ -418,7 +418,7 @@ WindowLevel( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 StartWindowLevel( )
 {
   if( this->State != VTKIS_NONE )
@@ -438,7 +438,7 @@ StartWindowLevel( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 EndWindowLevel( )
 {
   if( this->Mode == Self::NavigationMode )
@@ -455,7 +455,7 @@ EndWindowLevel( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 StartCursorMoving( )
 {
   if( this->CursorMoving )
@@ -465,7 +465,7 @@ StartCursorMoving( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 EndCursorMoving( )
 {
   if( !( this->CursorMoving ) )
@@ -474,7 +474,7 @@ EndCursorMoving( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 StartRadiusMoving( )
 {
   if( this->RadiusMoving )
@@ -485,7 +485,7 @@ StartRadiusMoving( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 EndRadiusMoving( )
 {
   if( !( this->RadiusMoving ) )
@@ -496,7 +496,7 @@ EndRadiusMoving( )
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+cpExtensions::Visualization::ImageInteractorStyle::
 ImageInteractorStyle( )
   : Superclass( ),
     Mode( Self::NavigationMode ),
@@ -578,13 +578,13 @@ ImageInteractorStyle( )
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+cpExtensions::Visualization::ImageInteractorStyle::
 ~ImageInteractorStyle( )
 {
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 _RenderAssociateInteractors( )
 {
   std::vector< vtkRenderWindowInteractor* >::iterator rIt =
@@ -594,7 +594,7 @@ _RenderAssociateInteractors( )
 }
 
 // -------------------------------------------------------------------------
-bool cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+bool cpExtensions::Visualization::ImageInteractorStyle::
 _PickPosition( double pos[ 3 ] )
 {
   if( this->m_SliceActors == NULL )
@@ -617,14 +617,14 @@ _PickPosition( double pos[ 3 ] )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 _UpdateCursor( )
 {
   std::cout << "upcur" << std::endl;
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageInteractorStyle::
+void cpExtensions::Visualization::ImageInteractorStyle::
 _UpdateRadius( )
 {
   vtkRenderer* ren =
similarity index 92%
rename from lib/cpPlugins/Extensions/Visualization/ImageInteractorStyle.h
rename to lib/cpExtensions/Visualization/ImageInteractorStyle.h
index 7ff6dbd6f5fdc0647cc396738da5ce0f3897c764..3a36885c554ee6fe9012e90cca3ffdd86ea0681a 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__IMAGEINTERACTORSTYLE__H__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__IMAGEINTERACTORSTYLE__H__
+#ifndef __CPEXTENSIONS__VISUALIZATION__IMAGEINTERACTORSTYLE__H__
+#define __CPEXTENSIONS__VISUALIZATION__IMAGEINTERACTORSTYLE__H__
 
 #include <vector>
 
@@ -8,7 +8,7 @@
 #include <vtkPropPicker.h>
 #include <vtkSmartPointer.h>
 
-#include <cpPlugins/Extensions/cpPlugins_Extensions_Export.h>
+#include <cpExtensions/cpExtensions_Export.h>
 
 // -------------------------------------------------------------------------
 #define cpPlugins_ImageInteractorStyle_ObserverMacro( e )               \
@@ -21,9 +21,7 @@
   inline void Remove##e##Observers( )                                   \
   { this->RemoveObservers( Self::e##Event ); }
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Visualization
     {
@@ -32,7 +30,7 @@ namespace cpPlugins
 
       /**
        */
-      class cpPlugins_Extensions_EXPORT ImageInteractorStyle
+      class cpExtensions_EXPORT ImageInteractorStyle
         : public vtkInteractorStyleImage
       {
       public:
@@ -152,10 +150,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__VISUALIZATION__IMAGEINTERACTORSTYLE__H__
+#endif // __CPEXTENSIONS__VISUALIZATION__IMAGEINTERACTORSTYLE__H__
 
 // eof - $RCSfile$
similarity index 89%
rename from lib/cpPlugins/Extensions/Visualization/ImageSliceActors.cxx
rename to lib/cpExtensions/Visualization/ImageSliceActors.cxx
index 2b52fb98827755edaa5c67a979e50178e26e2421..5536ab120e6c41a61b0c4c832d76bea071fb7456 100644 (file)
@@ -1,4 +1,4 @@
-#include <cpPlugins/Extensions/Visualization/ImageSliceActors.h>
+#include <cpExtensions/Visualization/ImageSliceActors.h>
 
 #include <vtkAlgorithmOutput.h>
 #include <vtkCellArray.h>
 #include <vtkTextProperty.h>
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::ImageSliceActors*
-cpPlugins::Extensions::Visualization::ImageSliceActors::
+cpExtensions::Visualization::ImageSliceActors*
+cpExtensions::Visualization::ImageSliceActors::
 New( )
 {
   return( new Self( ) );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageSliceActors::
+void cpExtensions::Visualization::ImageSliceActors::
 SetInputConnection( vtkAlgorithmOutput* aout, int axis )
 {
   this->SliceMapper->SetInputConnection( aout );
@@ -32,7 +32,7 @@ SetInputConnection( vtkAlgorithmOutput* aout, int axis )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageSliceActors::
+void cpExtensions::Visualization::ImageSliceActors::
 SetInputData( vtkImageData* data, int axis )
 {
   this->SliceMapper->SetInputData( data );
@@ -45,49 +45,49 @@ SetInputData( vtkImageData* data, int axis )
 }
 
 // -------------------------------------------------------------------------
-double* cpPlugins::Extensions::Visualization::ImageSliceActors::
+double* cpExtensions::Visualization::ImageSliceActors::
 GetDisplayBounds( ) const
 {
   return( this->ImageActor->GetDisplayBounds( ) );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageSliceActors::
+void cpExtensions::Visualization::ImageSliceActors::
 GetDisplayBounds( double bounds[ 6 ] ) const
 {
   this->ImageActor->GetDisplayBounds( bounds );
 }
 
 // -------------------------------------------------------------------------
-int cpPlugins::Extensions::Visualization::ImageSliceActors::
+int cpExtensions::Visualization::ImageSliceActors::
 GetAxis( ) const
 {
   return( this->SliceMapper->GetOrientation( ) );
 }
 
 // -------------------------------------------------------------------------
-int cpPlugins::Extensions::Visualization::ImageSliceActors::
+int cpExtensions::Visualization::ImageSliceActors::
 GetSliceNumber( ) const
 {
   return( this->SliceMapper->GetSliceNumber( ) );
 }
 
 // -------------------------------------------------------------------------
-int cpPlugins::Extensions::Visualization::ImageSliceActors::
+int cpExtensions::Visualization::ImageSliceActors::
 GetSliceNumberMinValue( ) const
 {
   return( this->SliceMapper->GetSliceNumberMinValue( ) );
 }
 
 // -------------------------------------------------------------------------
-int cpPlugins::Extensions::Visualization::ImageSliceActors::
+int cpExtensions::Visualization::ImageSliceActors::
 GetSliceNumberMaxValue( ) const
 {
   return( this->SliceMapper->GetSliceNumberMaxValue( ) );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageSliceActors::
+void cpExtensions::Visualization::ImageSliceActors::
 SetSliceNumber( const int& slice )
 {
   this->SliceMapper->SetSliceNumber( slice );
@@ -178,7 +178,7 @@ SetSliceNumber( const int& slice )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::ImageSliceActors::
+void cpExtensions::Visualization::ImageSliceActors::
 UpdateText( )
 {
   char axis;
@@ -197,7 +197,7 @@ UpdateText( )
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::ImageSliceActors::
+cpExtensions::Visualization::ImageSliceActors::
 ImageSliceActors( )
   : Superclass( )
 {
@@ -253,7 +253,7 @@ ImageSliceActors( )
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::ImageSliceActors::
+cpExtensions::Visualization::ImageSliceActors::
 ~ImageSliceActors( )
 {
 }
similarity index 88%
rename from lib/cpPlugins/Extensions/Visualization/ImageSliceActors.h
rename to lib/cpExtensions/Visualization/ImageSliceActors.h
index 3d050f38e336061978612bd904b04348e419f82f..3991ab39419309ec5f7399ea3e3a7381128cf2a7 100644 (file)
@@ -1,7 +1,7 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__IMAGESLICEACTORS__H__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__IMAGESLICEACTORS__H__
+#ifndef __CPEXTENSIONS__VISUALIZATION__IMAGESLICEACTORS__H__
+#define __CPEXTENSIONS__VISUALIZATION__IMAGESLICEACTORS__H__
 
-#include <cpPlugins/Extensions/cpPlugins_Extensions_Export.h>
+#include <cpExtensions/cpExtensions_Export.h>
 
 #include <vtkActor.h>
 #include <vtkImageActor.h>
@@ -29,15 +29,13 @@ class vtkAlgorithmOutput;
 class vtkImageData;
 
 // -------------------------------------------------------------------------
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Visualization
     {
       /**
        */
-      class cpPlugins_Extensions_EXPORT ImageSliceActors
+      class cpExtensions_EXPORT ImageSliceActors
         : public vtkPropCollection
       {
       public:
@@ -93,10 +91,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif //  __CPPLUGINS__EXTENSIONS__VISUALIZATION__IMAGESLICEACTORS__H__
+#endif //  __CPEXTENSIONS__VISUALIZATION__IMAGESLICEACTORS__H__
 
 // eof - $RCSfile$
similarity index 87%
rename from lib/cpPlugins/Extensions/Visualization/MPRActors.cxx
rename to lib/cpExtensions/Visualization/MPRActors.cxx
index c58cc5a21d709ea80be716ef0f44ffd920fa5db1..b7ebc2455ed796e0a74f56b6da10945ca12d066d 100644 (file)
@@ -1,4 +1,4 @@
-#include <cpPlugins/Extensions/Visualization/MPRActors.h>
+#include <cpExtensions/Visualization/MPRActors.h>
 
 #include <vtkImageData.h>
 #include <vtkInformation.h>
@@ -9,16 +9,16 @@
 #include <vtkWindowLevelLookupTable.h>
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::MPRActors*
-cpPlugins::Extensions::Visualization::MPRActors::
+cpExtensions::Visualization::MPRActors*
+cpExtensions::Visualization::MPRActors::
 New( )
 {
   return( new Self( ) );
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::
-ImageSliceActors* cpPlugins::Extensions::Visualization::MPRActors::
+cpExtensions::Visualization::
+ImageSliceActors* cpExtensions::Visualization::MPRActors::
 GetSliceActors( const int& i ) const
 {
   if( i < 3 )
@@ -28,7 +28,7 @@ GetSliceActors( const int& i ) const
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 SetInputConnection( vtkAlgorithmOutput* aout )
 {
   this->ImageMapToColors->SetInputConnection( aout );
@@ -37,7 +37,7 @@ SetInputConnection( vtkAlgorithmOutput* aout )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 SetInputData( vtkImageData* image )
 {
   this->ImageMapToColors->SetInputData( image );
@@ -46,7 +46,7 @@ SetInputData( vtkImageData* image )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 PushDataInto( vtkRenderer* x, vtkRenderer* y, vtkRenderer* z, vtkRenderer* w )
 {
   vtkRenderer* rends[] = { x, y, z };
@@ -77,7 +77,7 @@ PushDataInto( vtkRenderer* x, vtkRenderer* y, vtkRenderer* z, vtkRenderer* w )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 PopDataFrom( vtkRenderer* x, vtkRenderer* y, vtkRenderer* z, vtkRenderer* w )
 {
   vtkRenderer* rends[] = { x, y, z };
@@ -108,14 +108,14 @@ PopDataFrom( vtkRenderer* x, vtkRenderer* y, vtkRenderer* z, vtkRenderer* w )
 }
 
 // -------------------------------------------------------------------------
-vtkScalarsToColors* cpPlugins::Extensions::Visualization::MPRActors::
+vtkScalarsToColors* cpExtensions::Visualization::MPRActors::
 GetLookupTable( ) const
 {
   return( this->ImageMapToColors->GetLookupTable( ) );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 SetLookupTable( vtkScalarsToColors* lut )
 {
   this->ImageMapToColors->SetLookupTable( lut );
@@ -124,7 +124,7 @@ SetLookupTable( vtkScalarsToColors* lut )
 }
 
 // -------------------------------------------------------------------------
-vtkWindowLevelLookupTable* cpPlugins::Extensions::Visualization::MPRActors::
+vtkWindowLevelLookupTable* cpExtensions::Visualization::MPRActors::
 GetLookupTableAsWindowLevel( ) const
 {
   return(
@@ -133,7 +133,7 @@ GetLookupTableAsWindowLevel( ) const
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 SetLookupTableToWindowLevel( )
 {
   // Check if the input has been configured
@@ -154,14 +154,14 @@ SetLookupTableToWindowLevel( )
 }
 
 // -------------------------------------------------------------------------
-double cpPlugins::Extensions::Visualization::MPRActors::
+double cpExtensions::Visualization::MPRActors::
 GetMinWindow( ) const
 {
   return( double( 0 ) );
 }
 
 // -------------------------------------------------------------------------
-double cpPlugins::Extensions::Visualization::MPRActors::
+double cpExtensions::Visualization::MPRActors::
 GetMaxWindow( ) const
 {
   // Check if the input has been configured
@@ -175,7 +175,7 @@ GetMaxWindow( ) const
 }
 
 // -------------------------------------------------------------------------
-double cpPlugins::Extensions::Visualization::MPRActors::
+double cpExtensions::Visualization::MPRActors::
 GetMinLevel( ) const
 {
   // Check if the input has been configured
@@ -189,7 +189,7 @@ GetMinLevel( ) const
 }
 
 // -------------------------------------------------------------------------
-double cpPlugins::Extensions::Visualization::MPRActors::
+double cpExtensions::Visualization::MPRActors::
 GetMaxLevel( ) const
 {
   // Check if the input has been configured
@@ -203,7 +203,7 @@ GetMaxLevel( ) const
 }
 
 // -------------------------------------------------------------------------
-double cpPlugins::Extensions::Visualization::MPRActors::
+double cpExtensions::Visualization::MPRActors::
 GetWindow( ) const
 {
   vtkWindowLevelLookupTable* lut = this->GetLookupTableAsWindowLevel( );
@@ -214,7 +214,7 @@ GetWindow( ) const
 }
 
 // -------------------------------------------------------------------------
-double cpPlugins::Extensions::Visualization::MPRActors::
+double cpExtensions::Visualization::MPRActors::
 GetLevel( ) const
 {
   vtkWindowLevelLookupTable* lut = this->GetLookupTableAsWindowLevel( );
@@ -225,7 +225,7 @@ GetLevel( ) const
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 SetWindow( const double& w )
 {
   vtkWindowLevelLookupTable* lut = this->GetLookupTableAsWindowLevel( );
@@ -240,7 +240,7 @@ SetWindow( const double& w )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 SetLevel( const double& l )
 {
   vtkWindowLevelLookupTable* lut = this->GetLookupTableAsWindowLevel( );
@@ -255,7 +255,7 @@ SetLevel( const double& l )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 SetWindowLevel( const double& w, const double& l )
 {
   vtkWindowLevelLookupTable* lut = this->GetLookupTableAsWindowLevel( );
@@ -271,7 +271,7 @@ SetWindowLevel( const double& w, const double& l )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 ResetWindowLevel( )
 {
   vtkImageData* image = this->_InputImage( );
@@ -289,28 +289,28 @@ ResetWindowLevel( )
 }
 
 // -------------------------------------------------------------------------
-int cpPlugins::Extensions::Visualization::MPRActors::
+int cpExtensions::Visualization::MPRActors::
 GetSliceNumberMinValue( const int& axis ) const
 {
   return( this->Slices[ axis ]->GetSliceNumberMinValue( ) );
 }
 
 // -------------------------------------------------------------------------
-int cpPlugins::Extensions::Visualization::MPRActors::
+int cpExtensions::Visualization::MPRActors::
 GetSliceNumberMaxValue( const int& axis ) const
 {
   return( this->Slices[ axis ]->GetSliceNumberMaxValue( ) );
 }
 
 // -------------------------------------------------------------------------
-int cpPlugins::Extensions::Visualization::MPRActors::
+int cpExtensions::Visualization::MPRActors::
 GetSlice( const int& axis ) const
 {
   return( this->Slices[ axis ]->GetSliceNumber( ) );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 SetSlice( const int& axis, const int& slice )
 {
   vtkImageData* image = this->_InputImage( );
@@ -334,7 +334,7 @@ SetSlice( const int& axis, const int& slice )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 SetSlice( const int& axis, const double& slice )
 {
   vtkImageData* image = this->_InputImage( );
@@ -351,14 +351,14 @@ SetSlice( const int& axis, const double& slice )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 ResetSlices( )
 {
   // TODO
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 GetImageBounds( double bounds[ 6 ] ) const
 {
   vtkImageData* image = this->_InputImage( );
@@ -367,7 +367,7 @@ GetImageBounds( double bounds[ 6 ] ) const
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::MPRActors::
+cpExtensions::Visualization::MPRActors::
 MPRActors( )
   : Superclass( )
 {
@@ -379,13 +379,13 @@ MPRActors( )
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::MPRActors::
+cpExtensions::Visualization::MPRActors::
 ~MPRActors( )
 {
 }
 
 // -------------------------------------------------------------------------
-vtkImageData* cpPlugins::Extensions::Visualization::MPRActors::
+vtkImageData* cpExtensions::Visualization::MPRActors::
 _InputImage( ) const
 {
   vtkAlgorithm* algo = this->ImageMapToColors->GetInputAlgorithm( );
@@ -396,7 +396,7 @@ _InputImage( ) const
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRActors::
+void cpExtensions::Visualization::MPRActors::
 _UpdateSlices( )
 {
   // Check if the input has been configured
similarity index 85%
rename from lib/cpPlugins/Extensions/Visualization/MPRActors.h
rename to lib/cpExtensions/Visualization/MPRActors.h
index e7af3ff3e4b957bcfc4c59a8186eee108e5682b1..8cdfe5a963c9abbdfae81ec36ab2316563d45794 100644 (file)
@@ -1,8 +1,8 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__MPRACTORS__H__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__MPRACTORS__H__
+#ifndef __CPEXTENSIONS__VISUALIZATION__MPRACTORS__H__
+#define __CPEXTENSIONS__VISUALIZATION__MPRACTORS__H__
 
-#include <cpPlugins/Extensions/cpPlugins_Extensions_Export.h>
-#include <cpPlugins/Extensions/Visualization/ImageSliceActors.h>
+#include <cpExtensions/cpExtensions_Export.h>
+#include <cpExtensions/Visualization/ImageSliceActors.h>
 
 #include <vtkActor.h>
 #include <vtkImageMapToColors.h>
@@ -15,15 +15,13 @@ class vtkScalarsToColors;
 class vtkWindowLevelLookupTable;
 
 // -------------------------------------------------------------------------
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Visualization
     {
       /**
        */
-      class cpPlugins_Extensions_EXPORT MPRActors
+      class cpExtensions_EXPORT MPRActors
         : public vtkPropCollection
       {
       public:
@@ -101,7 +99,7 @@ namespace cpPlugins
         vtkSmartPointer< vtkActor >            ImageOutlineActor;
 
         typedef
-          cpPlugins::Extensions::Visualization::ImageSliceActors
+          cpExtensions::Visualization::ImageSliceActors
           _TSlice;
         vtkSmartPointer< _TSlice > Slices[ 3 ];
 
@@ -110,10 +108,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif //  __CPPLUGINS__EXTENSIONS__VISUALIZATION__MPRACTORS__H__
+#endif //  __CPEXTENSIONS__VISUALIZATION__MPRACTORS__H__
 
 // eof - $RCSfile$
similarity index 84%
rename from lib/cpPlugins/Extensions/Visualization/MPRWithDifferentWindows.cxx
rename to lib/cpExtensions/Visualization/MPRWithDifferentWindows.cxx
index 115de09c2db8eb1e438341c23aad2e803e9aceac..076b09b12954bad1a5303f3809315626596c43b7 100644 (file)
@@ -1,8 +1,8 @@
-#include <cpPlugins/Extensions/Visualization/MPRWithDifferentWindows.h>
+#include <cpExtensions/Visualization/MPRWithDifferentWindows.h>
 #include <vtkCamera.h>
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+cpExtensions::Visualization::MPRWithDifferentWindows::
 MPRWithDifferentWindows(
   vtkRenderWindow* xWin,
   vtkRenderWindow* yWin,
@@ -72,13 +72,13 @@ MPRWithDifferentWindows(
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+cpExtensions::Visualization::MPRWithDifferentWindows::
 ~MPRWithDifferentWindows( )
 {
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+void cpExtensions::Visualization::MPRWithDifferentWindows::
 SetImage( vtkImageData* image )
 {
   this->m_MPRActors->SetInputData( image );
@@ -103,7 +103,7 @@ SetImage( vtkImageData* image )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+void cpExtensions::Visualization::MPRWithDifferentWindows::
 SetModeToNavigation( )
 {
   for( unsigned int i = 0; i < 3; ++i )
@@ -115,7 +115,7 @@ SetModeToNavigation( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+void cpExtensions::Visualization::MPRWithDifferentWindows::
 SetModeToDeformation( )
 {
   for( unsigned int i = 0; i < 3; ++i )
@@ -127,7 +127,7 @@ SetModeToDeformation( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+void cpExtensions::Visualization::MPRWithDifferentWindows::
 ResetCamera( const int& id )
 {
   if( id < 4 )
@@ -136,7 +136,7 @@ ResetCamera( const int& id )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+void cpExtensions::Visualization::MPRWithDifferentWindows::
 ResetCameras( )
 {
   for( int i = 0; i < 4; ++i )
@@ -145,7 +145,7 @@ ResetCameras( )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+void cpExtensions::Visualization::MPRWithDifferentWindows::
 Render( const int& id )
 {
   if( id < 4 )
@@ -154,7 +154,7 @@ Render( const int& id )
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+void cpExtensions::Visualization::MPRWithDifferentWindows::
 RenderAll( )
 {
   for( int i = 0; i < 4; ++i )
@@ -163,7 +163,7 @@ RenderAll( )
 }
 
 // -------------------------------------------------------------------------
-vtkRenderer* cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+vtkRenderer* cpExtensions::Visualization::MPRWithDifferentWindows::
 GetRenderer( const int& id ) const
 {
   if( id < 4 )
@@ -173,7 +173,7 @@ GetRenderer( const int& id ) const
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::MPRWithDifferentWindows::
+void cpExtensions::Visualization::MPRWithDifferentWindows::
 Add3DActor( vtkProp3D* prop )
 {
   if( this->m_Renderers[ 3 ] != NULL )
similarity index 80%
rename from lib/cpPlugins/Extensions/Visualization/MPRWithDifferentWindows.h
rename to lib/cpExtensions/Visualization/MPRWithDifferentWindows.h
index addfad7084afdf3276b754dc4a6f458d87abaf95..d2c10b558595fda6727d2d010331db7b438d9d36 100644 (file)
@@ -1,9 +1,9 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__MPRWITHDIFFERENTWINDOWS__H__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__MPRWITHDIFFERENTWINDOWS__H__
+#ifndef __CPEXTENSIONS__VISUALIZATION__MPRWITHDIFFERENTWINDOWS__H__
+#define __CPEXTENSIONS__VISUALIZATION__MPRWITHDIFFERENTWINDOWS__H__
 
-#include <cpPlugins/Extensions/Visualization/MPRActors.h>
-#include <cpPlugins/Extensions/Visualization/ImageInteractorStyle.h>
-#include <cpPlugins/Extensions/cpPlugins_Extensions_Export.h>
+#include <cpExtensions/Visualization/MPRActors.h>
+#include <cpExtensions/Visualization/ImageInteractorStyle.h>
+#include <cpExtensions/cpExtensions_Export.h>
 
 #include <vtkImageData.h>
 #include <vtkRenderer.h>
@@ -31,20 +31,18 @@ inline void Remove##e##Observers( )                             \
       this->m_Styles[ i ]->Remove##e##Observers( );             \
 }
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Visualization
     {
       /**
        */
-      class cpPlugins_Extensions_EXPORT MPRWithDifferentWindows
+      class cpExtensions_EXPORT MPRWithDifferentWindows
       {
       public:
-        typedef cpPlugins::Extensions::Visualization::
+        typedef cpExtensions::Visualization::
         MPRActors TMPRActors;
-        typedef cpPlugins::Extensions::Visualization::
+        typedef cpExtensions::Visualization::
         ImageInteractorStyle TStyle;
 
       public:
@@ -86,11 +84,9 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__VISUALIZATION__MPRWITHDIFFERENTWINDOWS__H__
+#endif // __CPEXTENSIONS__VISUALIZATION__MPRWITHDIFFERENTWINDOWS__H__
 
 
 // eof - $RCSfile$
similarity index 89%
rename from lib/cpPlugins/Extensions/Visualization/MeshMapper.h
rename to lib/cpExtensions/Visualization/MeshMapper.h
index c97835c984cea05c932825ab095fd11007e17a8a..e72ba037ab3372b37b144682b8024f8483603d87 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__MESHMAPPER__H__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__MESHMAPPER__H__
+#ifndef __CPEXTENSIONS__VISUALIZATION__MESHMAPPER__H__
+#define __CPEXTENSIONS__VISUALIZATION__MESHMAPPER__H__
 
 #include <itkConceptChecking.h>
 #include <vtkMapper.h>
@@ -8,9 +8,7 @@ class vtkActor;
 class vtkInformation;
 class vtkRenderer;
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Visualization
     {
@@ -96,12 +94,10 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#include <cpPlugins/Extensions/Visualization/MeshMapper.hxx>
+#include <cpExtensions/Visualization/MeshMapper.hxx>
 
-#endif // __CPPLUGINS__EXTENSIONS__VISUALIZATION__MESHMAPPER__H__
+#endif // __CPEXTENSIONS__VISUALIZATION__MESHMAPPER__H__
 
 // eof - $RCSfile$
similarity index 75%
rename from lib/cpPlugins/Extensions/Visualization/MeshMapper.hxx
rename to lib/cpExtensions/Visualization/MeshMapper.hxx
index 5b44f2c8d2dedf3d695b2ffa876b9b28fd67446d..4374ffeced78564a5e9d89d9d12d00f5cadc2752 100644 (file)
@@ -1,27 +1,27 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__MESHMAPPER__HXX__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__MESHMAPPER__HXX__
+#ifndef __CPEXTENSIONS__VISUALIZATION__MESHMAPPER__HXX__
+#define __CPEXTENSIONS__VISUALIZATION__MESHMAPPER__HXX__
 
 #include <vtkInformation.h>
 #include <vtkMath.h>
 
-// TODO: #include <cpPlugins/Extensions/Visualization/OpenGLMeshMapper.h>
+// TODO: #include <cpExtensions/Visualization/OpenGLMeshMapper.h>
 
 // -------------------------------------------------------------------------
 /* TODO
    template< class M >
-   typename cpPlugins::Extensions::Visualization::MeshMapper< M >::
-   Self* cpPlugins::Extensions::Visualization::MeshMapper< M >::
+   typename cpExtensions::Visualization::MeshMapper< M >::
+   Self* cpExtensions::Visualization::MeshMapper< M >::
    New( )
    {
    return(
-   cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::New( )
+   cpExtensions::Visualization::OpenGLMeshMapper< M >::New( )
    );
    }
 */
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 ShallowCopy( vtkAbstractMapper* m )
 {
   Self* mapper = Self::SafeDownCast( m );
@@ -32,7 +32,7 @@ ShallowCopy( vtkAbstractMapper* m )
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 SetInputData( M* in )
 {
   if( this->Mesh != in )
@@ -45,7 +45,7 @@ SetInputData( M* in )
 
 // -------------------------------------------------------------------------
 template< class M >
-M* cpPlugins::Extensions::Visualization::MeshMapper< M >::
+M* cpExtensions::Visualization::MeshMapper< M >::
 GetInput( )
 {
   return( this->Mesh );
@@ -53,7 +53,7 @@ GetInput( )
 
 // -------------------------------------------------------------------------
 template< class M >
-const M* cpPlugins::Extensions::Visualization::MeshMapper< M >::
+const M* cpExtensions::Visualization::MeshMapper< M >::
 GetInput( ) const
 {
   return( this->Mesh );
@@ -61,7 +61,7 @@ GetInput( ) const
 
 // -------------------------------------------------------------------------
 template< class M >
-double* cpPlugins::Extensions::Visualization::MeshMapper< M >::
+double* cpExtensions::Visualization::MeshMapper< M >::
 GetBounds( )
 {
   // do we have an input
@@ -84,7 +84,7 @@ GetBounds( )
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 GetBounds( double bounds[ 6 ] )
 {
   this->Superclass::GetBounds( bounds );
@@ -92,7 +92,7 @@ GetBounds( double bounds[ 6 ] )
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 Render( vtkRenderer* aren, vtkActor* act )
 {
   if( this->Mesh.IsNull( ) )
@@ -106,7 +106,7 @@ Render( vtkRenderer* aren, vtkActor* act )
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 Update( )
 {
   // TODO:
@@ -115,7 +115,7 @@ Update( )
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 Update( int port )
 {
   // TODO:
@@ -124,7 +124,7 @@ Update( int port )
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 MapDataArrayToVertexAttribute(
   const char* vertexAttributeName,
   const char* dataArrayName,
@@ -137,7 +137,7 @@ MapDataArrayToVertexAttribute(
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 MapDataArrayToMultiTextureAttribute(
   int unit,
   const char* dataArrayName,
@@ -150,7 +150,7 @@ MapDataArrayToMultiTextureAttribute(
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 RemoveVertexAttributeMapping( const char* vertexAttributeName )
 {
   vtkErrorMacro( "Not implemented at this level..." );
@@ -158,7 +158,7 @@ RemoveVertexAttributeMapping( const char* vertexAttributeName )
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 RemoveAllVertexAttributeMappings( )
 {
   vtkErrorMacro( "Not implemented at this level..." );
@@ -166,7 +166,7 @@ RemoveAllVertexAttributeMappings( )
 
 // -------------------------------------------------------------------------
 template< class M >
-cpPlugins::Extensions::Visualization::MeshMapper< M >::
+cpExtensions::Visualization::MeshMapper< M >::
 MeshMapper( )
   : Superclass( )
 {
@@ -174,14 +174,14 @@ MeshMapper( )
 
 // -------------------------------------------------------------------------
 template< class M >
-cpPlugins::Extensions::Visualization::MeshMapper< M >::
+cpExtensions::Visualization::MeshMapper< M >::
 ~MeshMapper( )
 {
 }
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::MeshMapper< M >::
+void cpExtensions::Visualization::MeshMapper< M >::
 ComputeBounds( )
 {
   static const TScalar _0 = TScalar( 0 );
@@ -212,13 +212,13 @@ ComputeBounds( )
 
 // -------------------------------------------------------------------------
 template< class M >
-int cpPlugins::Extensions::Visualization::MeshMapper< M >::
+int cpExtensions::Visualization::MeshMapper< M >::
 FillInputPortInformation( int port, vtkInformation* info )
 {
   info->Set( vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE( ), "itk::Mesh" );
   return( 1 );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__VISUALIZATION__MESHMAPPER__HXX__
+#endif // __CPEXTENSIONS__VISUALIZATION__MESHMAPPER__HXX__
 
 // eof - $RCSfile$
similarity index 79%
rename from lib/cpPlugins/Extensions/Visualization/OpenGLMeshMapper.h
rename to lib/cpExtensions/Visualization/OpenGLMeshMapper.h
index f22c6b4ff414a23c0d68e247e93b6d8a8ec37751..6a959e39329c4b2ef97004af70f67530889fd194 100644 (file)
@@ -1,13 +1,11 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__H__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__H__
+#ifndef __CPEXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__H__
+#define __CPEXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__H__
 
 #include <vector>
 
-#include <cpPlugins/Extensions/Visualization/MeshMapper.h>
+#include <cpExtensions/Visualization/MeshMapper.h>
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Visualization
     {
@@ -34,7 +32,7 @@ namespace cpPlugins
 
       public:
         virtual const char* GetNameOfClass( ) const
-          { return( "cpPlugins::Extensions::OpenGLMeshMapper" ); }
+          { return( "cpExtensions::OpenGLMeshMapper" ); }
         static Self* New( );
 
         virtual void RenderPiece( vtkRenderer* aren, vtkActor* act );
@@ -71,10 +69,8 @@ namespace cpPlugins
 
   } // ecapseman
 
-} // ecapseman
+#include <cpExtensions/Visualization/OpenGLMeshMapper.hxx>
 
-#include <cpPlugins/Extensions/Visualization/OpenGLMeshMapper.hxx>
-
-#endif // __CPPLUGINS__EXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__H__
+#endif // __CPEXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__H__
 
 // eof - $RCSfile$
similarity index 96%
rename from lib/cpPlugins/Extensions/Visualization/OpenGLMeshMapper.hxx
rename to lib/cpExtensions/Visualization/OpenGLMeshMapper.hxx
index 3ad1bc7a1c2fc21f50e056b41951070571eba44d..61a9e1a9066a381cb6158ebde274d2e0edce56e3 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__HXX__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__HXX__
+#ifndef __CPEXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__HXX__
+#define __CPEXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__HXX__
 
 #include <algorithm>
 #include <string>
@@ -57,8 +57,8 @@ PFNGLUNMAPBUFFERARBPROC          pglUnmapBuffer = 0;
 
 // -------------------------------------------------------------------------
 template< class M >
-typename cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::
-Self* cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::
+typename cpExtensions::Visualization::OpenGLMeshMapper< M >::
+Self* cpExtensions::Visualization::OpenGLMeshMapper< M >::
 New( )
 {
   return( new Self( ) );
@@ -66,7 +66,7 @@ New( )
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::
+void cpExtensions::Visualization::OpenGLMeshMapper< M >::
 RenderPiece( vtkRenderer* aren, vtkActor* act )
 {
   vtkOpenGLClearErrorMacro( );
@@ -235,7 +235,7 @@ RenderPiece( vtkRenderer* aren, vtkActor* act )
 
 // -------------------------------------------------------------------------
 template< class M >
-void cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::
+void cpExtensions::Visualization::OpenGLMeshMapper< M >::
 ReleaseGraphicsResources( vtkWindow* win )
 {
   if( win && win->GetMapped( ) )
@@ -256,7 +256,7 @@ ReleaseGraphicsResources( vtkWindow* win )
 
 // -------------------------------------------------------------------------
 template< class M >
-int cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::
+int cpExtensions::Visualization::OpenGLMeshMapper< M >::
 Draw( vtkRenderer* aren, vtkActor* act )
 {
   vtkOpenGLClearErrorMacro( );
@@ -501,7 +501,7 @@ Draw( vtkRenderer* aren, vtkActor* act )
 
 // -------------------------------------------------------------------------
 template< class M >
-cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::
+cpExtensions::Visualization::OpenGLMeshMapper< M >::
 OpenGLMeshMapper( )
   : Superclass( ),
     TotalCells( 0 ),
@@ -527,7 +527,7 @@ OpenGLMeshMapper( )
 
 // -------------------------------------------------------------------------
 template< class M >
-cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::
+cpExtensions::Visualization::OpenGLMeshMapper< M >::
 ~OpenGLMeshMapper( )
 {
   if( this->LastWindow )
@@ -545,7 +545,7 @@ cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::
 
 // -------------------------------------------------------------------------
 template< class M >
-bool cpPlugins::Extensions::Visualization::OpenGLMeshMapper< M >::
+bool cpExtensions::Visualization::OpenGLMeshMapper< M >::
 _ConfigureOpenGL( )
 {
   M* input = this->GetInput( );
@@ -667,6 +667,6 @@ _ConfigureOpenGL( )
   return( true );
 }
 
-#endif // __CPPLUGINS__EXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__HXX__
+#endif // __CPEXTENSIONS__VISUALIZATION__OPENGLMESHMAPPER__HXX__
 
 // eof - $RCSfile$
similarity index 78%
rename from lib/cpPlugins/Extensions/Visualization/SeedWidgetCorrector.cxx
rename to lib/cpExtensions/Visualization/SeedWidgetCorrector.cxx
index 8c043c82a51d05ff1925215aba027e42cf851cf5..f76cc9f41c66ca5bc21f2b61fbad7b85773fdd83 100644 (file)
@@ -1,4 +1,4 @@
-#include <cpPlugins/Extensions/Visualization/SeedWidgetCorrector.h>
+#include <cpExtensions/Visualization/SeedWidgetCorrector.h>
 
 #include <vtkCellPicker.h>
 #include <vtkSeedWidget.h>
@@ -8,22 +8,22 @@
 #include <vtkRenderWindowInteractor.h>
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::SeedWidgetCorrector*
-cpPlugins::Extensions::Visualization::SeedWidgetCorrector::
+cpExtensions::Visualization::SeedWidgetCorrector*
+cpExtensions::Visualization::SeedWidgetCorrector::
 New( )
 {
-  return( new cpPlugins::Extensions::Visualization::SeedWidgetCorrector );
+  return( new cpExtensions::Visualization::SeedWidgetCorrector );
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::SeedWidgetCorrector::
+void cpExtensions::Visualization::SeedWidgetCorrector::
 Configure( vtkCellPicker* picker )
 {
   this->m_Picker = picker;
 }
 
 // -------------------------------------------------------------------------
-void cpPlugins::Extensions::Visualization::SeedWidgetCorrector::
+void cpExtensions::Visualization::SeedWidgetCorrector::
 Execute( vtkObject* caller, unsigned long eventId, void* arguments )
 {
   vtkSeedWidget* wdg = dynamic_cast< vtkSeedWidget* >( caller );
@@ -63,7 +63,7 @@ Execute( vtkObject* caller, unsigned long eventId, void* arguments )
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::SeedWidgetCorrector::
+cpExtensions::Visualization::SeedWidgetCorrector::
 SeedWidgetCorrector( )
   : vtkCommand( ),
     m_Picker( NULL )
@@ -71,7 +71,7 @@ SeedWidgetCorrector( )
 }
 
 // -------------------------------------------------------------------------
-cpPlugins::Extensions::Visualization::SeedWidgetCorrector::
+cpExtensions::Visualization::SeedWidgetCorrector::
 ~SeedWidgetCorrector( )
 {
 }
similarity index 60%
rename from lib/cpPlugins/Extensions/Visualization/SeedWidgetCorrector.h
rename to lib/cpExtensions/Visualization/SeedWidgetCorrector.h
index 6493c0dd5cf5332d1e3ffbdd55a7dc17ff0fc2a3..13bd75cb1d6663bb7c2006af413a0e4cbc9845ab 100644 (file)
@@ -1,22 +1,20 @@
-#ifndef __CPPLUGINS__EXTENSIONS__VISUALIZATION__SEEDWIDGETCORRECTOR__H__
-#define __CPPLUGINS__EXTENSIONS__VISUALIZATION__SEEDWIDGETCORRECTOR__H__
+#ifndef __CPEXTENSIONS__VISUALIZATION__SEEDWIDGETCORRECTOR__H__
+#define __CPEXTENSIONS__VISUALIZATION__SEEDWIDGETCORRECTOR__H__
 
-#include <cpPlugins/Extensions/cpPlugins_Extensions_Export.h>
+#include <cpExtensions/cpExtensions_Export.h>
 
 #include <vtkCommand.h>
 
 class vtkCellPicker;
 class vtkSeedWidget;
 
-namespace cpPlugins
-{
-  namespace Extensions
+namespace cpExtensions
   {
     namespace Visualization
     {
       /**
        */
-      class cpPlugins_Extensions_EXPORT SeedWidgetCorrector
+      class cpExtensions_EXPORT SeedWidgetCorrector
         : public vtkCommand
       {
       public:
@@ -40,10 +38,8 @@ namespace cpPlugins
 
     } // ecapseman
 
-  } // ecapseman
-
 } // ecapseman
 
-#endif // __CPPLUGINS__EXTENSIONS__VISUALIZATION__SEEDWIDGETCORRECTOR__H__
+#endif // __CPEXTENSIONS__VISUALIZATION__SEEDWIDGETCORRECTOR__H__
 
 // eof - $RCSfile$
index 9d68dcdf46c4bfad881c5e553b12c95089ca546a..89f1e3ceda0473ac4826b9e7f7521873a7b0891b 100644 (file)
@@ -1,7 +1,102 @@
-SUBDIRS(
-  Extensions
+SET(LIBRARY_NAME cpPlugins)
+
+## ===============
+## = Source code =
+## ===============
+
+FILE(GLOB Interface_LIB_HEADERS_H   "Interface/*.h")
+FILE(GLOB Interface_LIB_HEADERS_HPP "Interface/*.hpp")
+FILE(GLOB Interface_LIB_HEADERS_HXX "Interface/*.hxx")
+FILE(GLOB Interface_LIB_SOURCES_C   "Interface/*.c")
+FILE(GLOB Interface_LIB_SOURCES_CPP "Interface/*.cpp")
+FILE(GLOB Interface_LIB_SOURCES_CXX "Interface/*.cxx")
+
+SET(
+  LIB_HEADERS_H
+  Plugins/ImageReader.h
+  Plugins/ImageWriter.h
+  Plugins/MeshReader.h
+  Plugins/MeshWriter.h
+  Plugins/MarchingCubes.h
+  Plugins/OtsuThresholdImageFilter.h
+  )
+SET(
+  LIB_SOURCES_CXX
+  Plugins/Host.cxx
+  Plugins/ImageReader.cxx
+  Plugins/ImageWriter.cxx
+  Plugins/MeshReader.cxx
+  Plugins/MeshWriter.cxx
+  Plugins/MarchingCubes.cxx
+  Plugins/OtsuThresholdImageFilter.cxx
+  )
+
+## =====================
+## = Compilation rules =
+## =====================
+
+ADD_LIBRARY(
+  ${LIBRARY_NAME}
+  SHARED
+  ${Interface_LIB_SOURCES_C}
+  ${Interface_LIB_SOURCES_CPP}
+  ${Interface_LIB_SOURCES_CXX}
+  ${LIB_SOURCES_C}
+  ${LIB_SOURCES_CPP}
+  ${LIB_SOURCES_CXX}
+  )
+GENERATE_EXPORT_HEADER(
+  ${LIBRARY_NAME}
+  BASE_NAME ${LIBRARY_NAME}
+  EXPORT_MACRO_NAME ${LIBRARY_NAME}_EXPORT
+  EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/lib/cpPlugins/${LIBRARY_NAME}_Export.h
+  STATIC_DEFINE ${LIBRARY_NAME}_BUILT_AS_STATIC
+  )
+TARGET_LINK_LIBRARIES(
+  ${LIBRARY_NAME}
+  ${ITK_LIBRARIES}
+  ${VTK_LIBRARIES}
+  cpPlugins_Pluma
+  )
+
+## ========================
+## -- Installation rules --
+## ========================
+
+INSTALL(
+  TARGETS ${LIBRARY_NAME}
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib/static
+  )
+
+SET(
+  local_install_dirs
   Interface
-  Plugins
   )
+FOREACH(dir ${local_install_dirs})
+  INSTALL(
+    DIRECTORY ${dir}
+    DESTINATION include/cpPlugins/Interface
+    FILES_MATCHING PATTERN "*.h"
+    )
+  INSTALL(
+    DIRECTORY ${dir}
+    DESTINATION include/cpPlugins/Interface
+    FILES_MATCHING PATTERN "*.hxx"
+    )
+  INSTALL(
+    DIRECTORY ${dir}
+    DESTINATION include/cpPlugins/Interface
+    FILES_MATCHING PATTERN "*.hpp"
+    )
+ENDFOREACH(dir)
+
+INSTALL(
+  FILES
+  ${PROJECT_BINARY_DIR}/lib/cpPlugins/Interface/${LIBRARY_NAME}_Export.h
+  DESTINATION include/cpPlugins/Interface
+  )
+
 
 ## eof - $RCSfile$
index e61da5cbef4f04b82e41afccb1e092008795cd63..cc8d8bfe60a66ce81cfce5f54d988a45f06b5912 100644 (file)
@@ -5,7 +5,7 @@
 #include <string>
 #include <vtkDataObject.h>
 #include <vtkSmartPointer.h>
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/Object.h>
 
 #define ITK_MANUAL_INSTANTIATION
@@ -17,7 +17,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT DataObject
+    class cpPlugins_EXPORT DataObject
       : public Object
     {
     public:
index 0c1aafb5f9be01811fb4158b38719320fc84cdbd..61d2ec4d7b9058f5dbf784ccc95c9c059045a76c 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__FILTEROBJECT__H__
 #define __CPPLUGINS__INTERFACE__FILTEROBJECT__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/ProcessObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT FilterObject
+    class cpPlugins_EXPORT FilterObject
       : public ProcessObject
     {
     public:
index a354da2d22aed395f86e4601a9b0b572a1c53948..68367fdf7c9bba0fb9acee81f0f4de8246a0efc7 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <map>
 #include <string>
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
 #define ITK_MANUAL_INSTANTIATION
@@ -28,7 +28,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT Image
+    class cpPlugins_EXPORT Image
       : public DataObject
     {
     public:
index d8af19b2f199926a13b35470c084474d238082f3..7af90565c0c1be0d0df6039390be6c8deff5648c 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__IMAGESINK__H__
 #define __CPPLUGINS__INTERFACE__IMAGESINK__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/SinkObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT ImageSink
+    class cpPlugins_EXPORT ImageSink
       : public SinkObject
     {
     public:
index d2e0c527ff824e9b3a20db6deb492347600f7e09..f5b83964890edc2465e0c0b92c7cee412d0378b4 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__IMAGESOURCE__H__
 #define __CPPLUGINS__INTERFACE__IMAGESOURCE__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/SourceObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT ImageSource
+    class cpPlugins_EXPORT ImageSource
       : public SourceObject
     {
     public:
index 2cc56ae1b3ea6fc7cf109f29e61ec82106384cbf..08583620e6d685bd94984a6c3ffca371521b2d68 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__IMAGETOIMAGEFILTER__H__
 #define __CPPLUGINS__INTERFACE__IMAGETOIMAGEFILTER__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/FilterObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT ImageToImageFilter
+    class cpPlugins_EXPORT ImageToImageFilter
       : public FilterObject
     {
     public:
index f919c96701586df7f4e14e207605d8b44030f73f..499a5e9c2272f0685aaad478d4b971a29ad41adf 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__IMAGETOMESHFILTER__H__
 #define __CPPLUGINS__INTERFACE__IMAGETOMESHFILTER__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/FilterObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT ImageToMeshFilter
+    class cpPlugins_EXPORT ImageToMeshFilter
       : public FilterObject
     {
     public:
index a51f8be231409e38857b9b3a761b2c9dcebd818c..555bbae0648c411586736512bd2c2afe4df27b92 100644 (file)
@@ -6,7 +6,7 @@
 #include <vector>
 #include <Pluma/Pluma.hpp>
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/Object.h>
 #include <cpPlugins/Interface/ProcessObject.h>
 
@@ -16,7 +16,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT Interface
+    class cpPlugins_EXPORT Interface
     {
     public:
       typedef std::vector< ObjectProvider* >        TProviders;
index ffaec80ce9809f4589893c4b35dabcc320957bfc..ae7292891d2b1cfccb226a596f9c7bff1b1459eb 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__MESH__H__
 #define __CPPLUGINS__INTERFACE__MESH__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
 class vtkPolyData;
@@ -12,7 +12,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT Mesh
+    class cpPlugins_EXPORT Mesh
       : public DataObject
     {
     public:
index 3438e3a75bbf618a8a7520c97b81e4b737138ddc..a23b55a98459c1d17426df4c6a9bd775257498b1 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__MESHSINK__H__
 #define __CPPLUGINS__INTERFACE__MESHSINK__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/SinkObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT MeshSink
+    class cpPlugins_EXPORT MeshSink
       : public SinkObject
     {
     public:
index fe1a9793499db2820cb50bcc6e47bfe0aab98c2d..5c1257f955ca52fc50b0a5973dc7fbab77f054af 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__MESHSOURCE__H__
 #define __CPPLUGINS__INTERFACE__MESHSOURCE__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/SourceObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT MeshSource
+    class cpPlugins_EXPORT MeshSource
       : public SourceObject
     {
     public:
index 698ad0ae023f42b4cea96bd0fd0a9cd83f3f8a64..97947d1d4456819ea692d469928e31fa8140cc0a 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__MESHTOIMAGEFILTER__H__
 #define __CPPLUGINS__INTERFACE__MESHTOIMAGEFILTER__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/FilterObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT MeshToImageFilter
+    class cpPlugins_EXPORT MeshToImageFilter
       : public FilterObject
     {
     public:
index 399c3f726cd9fabacadf910228747f76a16e237a..aa3cf1135eab9367ffde6f7820f6df955666e2d2 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__MESHTOMESHFILTER__H__
 #define __CPPLUGINS__INTERFACE__MESHTOMESHFILTER__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/FilterObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT MeshToMeshFilter
+    class cpPlugins_EXPORT MeshToMeshFilter
       : public FilterObject
     {
     public:
index b133fe70281e60724a4c0a6f021c119228ade2d8..ef8cab82dfedf6c96feaa84174cd9ef86462c1ca 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <Pluma/Pluma.hpp>
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 
 #define ITK_MANUAL_INSTANTIATION
 #include <itkObject.h>
@@ -11,7 +11,7 @@
 
 // -------------------------------------------------------------------------
 #define CPPLUGINS_PROVIDER_HEADER_BEGIN( TYPE )                 \
-  class cpPlugins_Interface_EXPORT TYPE##Provider               \
+  class cpPlugins_EXPORT TYPE##Provider               \
     : public pluma::Provider                                    \
   {                                                             \
   private:                                                      \
@@ -58,7 +58,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT Object
+    class cpPlugins_EXPORT Object
       : public itk::Object
     {
     public:
index 0e54f0f7fdfae594e9fd9a55cb7042fde4a22a10..def98e7ddb46dba8efc81ab3c6302596051d3d2f 100644 (file)
@@ -5,7 +5,7 @@
 #include <ostream>
 #include <string>
 #include <vector>
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 
 namespace cpPlugins
 {
@@ -13,7 +13,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT Parameters
+    class cpPlugins_EXPORT Parameters
     {
       // -------------------------------------------------------------------
       friend std::ostream& operator<<(
index 61ea66aa7b0f66b5be810341685535c034762edf..742db572c0b00b49c8ba4aae762fd3f4b7381179 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__PROCESSOBJECT__H__
 #define __CPPLUGINS__INTERFACE__PROCESSOBJECT__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/Object.h>
 #include <cpPlugins/Interface/DataObject.h>
 #include <cpPlugins/Interface/Parameters.h>
@@ -17,7 +17,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT ProcessObject
+    class cpPlugins_EXPORT ProcessObject
       : public Object
     {
     public:
index b03fb9dc072bad8510448936d8ccc91041d42c8d..644f26afc123c3f4704172513e8e352a40a7eebf 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__SINKOBJECT__H__
 #define __CPPLUGINS__INTERFACE__SINKOBJECT__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/ProcessObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT SinkObject
+    class cpPlugins_EXPORT SinkObject
       : public ProcessObject
     {
     public:
index 5a030b249463df6791b8a992f5643cfe9ea2a642..034d788cdaf7481bcfde98c441667ce8c8932bc4 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__INTERFACE__SOURCEOBJECT__H__
 #define __CPPLUGINS__INTERFACE__SOURCEOBJECT__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/ProcessObject.h>
 
 namespace cpPlugins
@@ -10,7 +10,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_Interface_EXPORT SourceObject
+    class cpPlugins_EXPORT SourceObject
       : public ProcessObject
     {
     public:
index 682e8054ec575bb7dca632032f9141bff8c59ef7..f52d4096c54dd8732295426dc2c3b7c51da70fb5 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <cpPlugins/Plugins/cpPlugins_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/ImageSource.h>
 
 #define ITK_MANUAL_INSTANTIATION
index e6e8220349bf9fd00f216db6e1867de86faf1f92..31bdad1abb6486202c24600403f997273319b70a 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__PLUGINS__IMAGEWRITER__H__
 #define __CPPLUGINS__PLUGINS__IMAGEWRITER__H__
 
-#include <cpPlugins/Plugins/cpPlugins_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/ImageSink.h>
 
 namespace cpPlugins
index 4375842d02d5155455f4357286deed92c193b849..1976e68b380402f6cc72d41a77c20543e5117f75 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__PLUGINS__MARCHINGCUBES__H__
 #define __CPPLUGINS__PLUGINS__MARCHINGCUBES__H__
 
-#include <cpPlugins/Plugins/cpPlugins_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/ImageToMeshFilter.h>
 
 class vtkPolyDataAlgorithm;
index d2b42de38452bd8e3233ed559b9a796f27788640..33132c1ee50fc40292e22a4f456c573ecc3e4e55 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__PLUGINS__MESHREADER__H__
 #define __CPPLUGINS__PLUGINS__MESHREADER__H__
 
-#include <cpPlugins/Plugins/cpPlugins_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/MeshSource.h>
 
 class vtkDataReader;
index d0726ecf785d94deb66658522442ec1d0dce3cfa..b62620917366a2a8b044927b20972561a0da510d 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__PLUGINS__MESHWRITER__H__
 #define __CPPLUGINS__PLUGINS__MESHWRITER__H__
 
-#include <cpPlugins/Plugins/cpPlugins_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/MeshSink.h>
 
 class vtkDataWriter;
index 07c9b75ea0f00e10a0673c9645224b6a9b0a8051..da26fd03616aaef61e57d2ec4cc90f1914a5bbab 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __CPPLUGINS__PLUGINS__OTSUTHRESHOLDIMAGEFILTER__H__
 #define __CPPLUGINS__PLUGINS__OTSUTHRESHOLDIMAGEFILTER__H__
 
-#include <cpPlugins/Plugins/cpPlugins_Export.h>
+#include <cpPlugins/cpPlugins_Export.h>
 #include <cpPlugins/Interface/ImageToImageFilter.h>
 
 namespace cpPlugins