Commit 6305b789 authored by remicres's avatar remicres
Browse files

REFAC: use lsgrm namespace

parent 9493484b
...@@ -134,7 +134,7 @@ private: ...@@ -134,7 +134,7 @@ private:
*/ */
using ImageType = otb::VectorImage<float, 2>; using ImageType = otb::VectorImage<float, 2>;
using SegmenterType = lsrm::BaatzSegmenter<ImageType>; using SegmenterType = lsgrm::BaatzSegmenter<ImageType>;
using ControllerType = lsgrm::Controller<SegmenterType>; using ControllerType = lsgrm::Controller<SegmenterType>;
ImageType::Pointer inputImage = GetParameterFloatVectorImage("in"); ImageType::Pointer inputImage = GetParameterFloatVectorImage("in");
......
#ifndef __LSGRM_CONTROLLER_H #ifndef __LSGRM_CONTROLLER_H
#define __LSGRM_CONTROLLER_H #define __LSGRM_CONTROLLER_H
#include "lsrmGetInternalMemory.h" #include "lsgrmGetInternalMemory.h"
#include "lsgrmSplitter.h" #include "lsgrmSplitter.h"
#include "lsgrmGraphOperations.h" #include "lsgrmGraphOperations.h"
#include "itkObject.h" #include "itkObject.h"
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <time.h> #include <time.h>
#include "lpContour.h" #include "lpContour.h"
namespace lsrm namespace lsgrm
{ {
template<class TGraph> template<class TGraph>
class GraphToOtbImage class GraphToOtbImage
...@@ -35,5 +35,5 @@ namespace lsrm ...@@ -35,5 +35,5 @@ namespace lsrm
}; };
} // end of namespace lsrm } // end of namespace lsrm
#include "lsrmGraphToOtbImage.txx" #include "lsgrmGraphToOtbImage.txx"
#endif #endif
#ifndef __LSRM_GRAPH_TO_OTBIMAGE_TXX #ifndef __LSRM_GRAPH_TO_OTBIMAGE_TXX
#define __LSRM_GRAPH_TO_OTBIMAGE_TXX #define __LSRM_GRAPH_TO_OTBIMAGE_TXX
#include "lsrmGraphToOtbImage.h" #include "lsgrmGraphToOtbImage.h"
#include "itkImageRegionIterator.h" #include "itkImageRegionIterator.h"
#include "itkGrayscaleFillholeImageFilter.h" #include "itkGrayscaleFillholeImageFilter.h"
namespace lsrm namespace lsgrm
{ {
template<class TGraph> template<class TGraph>
typename GraphToOtbImage<TGraph>::LabelImageType::Pointer typename GraphToOtbImage<TGraph>::LabelImageType::Pointer
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
#define __LSRM_SEGMENTER_H #define __LSRM_SEGMENTER_H
#include "macro-generator.h" #include "macro-generator.h"
#include "grmSegmenter.h" #include "grmSegmenter.h"
#include "lsrmGraphToOtbImage.h" #include "lsgrmGraphToOtbImage.h"
namespace lsrm namespace lsgrm
{ {
template<class TSegmenterType> template<class TSegmenterType>
class Segmenter : public TSegmenterType class Segmenter : public TSegmenterType
...@@ -19,7 +19,7 @@ public: ...@@ -19,7 +19,7 @@ public:
typedef typename GraphType::EdgeType EdgeType; typedef typename GraphType::EdgeType EdgeType;
typedef typename grm::GraphOperations<TSegmenterType> GraphOperatorType; typedef typename grm::GraphOperations<TSegmenterType> GraphOperatorType;
typedef typename GraphOperatorType::NodePointerType NodePointerType; typedef typename GraphOperatorType::NodePointerType NodePointerType;
typedef lsrm::GraphToOtbImage<GraphType> IOType; typedef GraphToOtbImage<GraphType> IOType;
typedef typename IOType::LabelImageType LabelImageType; typedef typename IOType::LabelImageType LabelImageType;
~Segmenter(){}; ~Segmenter(){};
...@@ -193,7 +193,7 @@ public: ...@@ -193,7 +193,7 @@ public:
} }
}; };
} // end of namespace lsrm } // end of namespace lsgrm
#endif #endif
......
#ifndef __LSRM_BAATZ_SEGMENTER_H #ifndef __LSRM_BAATZ_SEGMENTER_H
#define __LSRM_BAATZ_SEGMENTER_H #define __LSRM_BAATZ_SEGMENTER_H
#include "lsrmSegmenter.h" #include "lsgrmSegmenter.h"
#include "grmBaatzSegmenter.h" #include "grmBaatzSegmenter.h"
namespace lsrm namespace lsgrm
{ {
template<class TImage> template<class TImage>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <otbImageFileReader.h> #include <otbImageFileReader.h>
#include <itkImageRegionIterator.h> #include <itkImageRegionIterator.h>
namespace lsrm namespace lsgrm
{ {
template<class TImage> template<class TImage>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment