From 6305b789efff14c0bf2d98aaa73feafe8b68e0ac Mon Sep 17 00:00:00 2001
From: remicres <remi.cresson@teledetection.fr>
Date: Wed, 24 Aug 2016 08:41:25 +0000
Subject: [PATCH] REFAC: use lsgrm namespace

---
 app/otbLSGRM.cxx                                          | 2 +-
 include/lsgrmController.h                                 | 2 +-
 .../{lsrmGetInternalMemory.h => lsgrmGetInternalMemory.h} | 0
 include/{lsrmGraphToOtbImage.h => lsgrmGraphToOtbImage.h} | 4 ++--
 .../{lsrmGraphToOtbImage.txx => lsgrmGraphToOtbImage.txx} | 4 ++--
 include/{lsrmSegmenter.h => lsgrmSegmenter.h}             | 8 ++++----
 include/lsrmBaatzSegmenter.h                              | 4 ++--
 include/lsrmBaatzSegmenter.txx                            | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)
 rename include/{lsrmGetInternalMemory.h => lsgrmGetInternalMemory.h} (100%)
 rename include/{lsrmGraphToOtbImage.h => lsgrmGraphToOtbImage.h} (94%)
 rename include/{lsrmGraphToOtbImage.txx => lsgrmGraphToOtbImage.txx} (98%)
 rename include/{lsrmSegmenter.h => lsgrmSegmenter.h} (97%)

diff --git a/app/otbLSGRM.cxx b/app/otbLSGRM.cxx
index 28fe19c..a6618e7 100644
--- a/app/otbLSGRM.cxx
+++ b/app/otbLSGRM.cxx
@@ -134,7 +134,7 @@ private:
      */
 
     using ImageType = otb::VectorImage<float, 2>;
-    using SegmenterType = lsrm::BaatzSegmenter<ImageType>;
+    using SegmenterType = lsgrm::BaatzSegmenter<ImageType>;
     using ControllerType = lsgrm::Controller<SegmenterType>;
 
     ImageType::Pointer inputImage = GetParameterFloatVectorImage("in");
diff --git a/include/lsgrmController.h b/include/lsgrmController.h
index 545e96d..dcff251 100644
--- a/include/lsgrmController.h
+++ b/include/lsgrmController.h
@@ -1,6 +1,6 @@
 #ifndef __LSGRM_CONTROLLER_H
 #define __LSGRM_CONTROLLER_H
-#include "lsrmGetInternalMemory.h"
+#include "lsgrmGetInternalMemory.h"
 #include "lsgrmSplitter.h"
 #include "lsgrmGraphOperations.h"
 #include "itkObject.h"
diff --git a/include/lsrmGetInternalMemory.h b/include/lsgrmGetInternalMemory.h
similarity index 100%
rename from include/lsrmGetInternalMemory.h
rename to include/lsgrmGetInternalMemory.h
diff --git a/include/lsrmGraphToOtbImage.h b/include/lsgrmGraphToOtbImage.h
similarity index 94%
rename from include/lsrmGraphToOtbImage.h
rename to include/lsgrmGraphToOtbImage.h
index b795465..8cca7a8 100644
--- a/include/lsrmGraphToOtbImage.h
+++ b/include/lsgrmGraphToOtbImage.h
@@ -12,7 +12,7 @@
 #include <time.h>
 #include "lpContour.h"
 
-namespace lsrm
+namespace lsgrm
 {
 	template<class TGraph>
 	class GraphToOtbImage
@@ -35,5 +35,5 @@ namespace lsrm
 	};
 	
 } // end of namespace lsrm
-#include "lsrmGraphToOtbImage.txx"
+#include "lsgrmGraphToOtbImage.txx"
 #endif
diff --git a/include/lsrmGraphToOtbImage.txx b/include/lsgrmGraphToOtbImage.txx
similarity index 98%
rename from include/lsrmGraphToOtbImage.txx
rename to include/lsgrmGraphToOtbImage.txx
index 68bf468..ba9ec34 100644
--- a/include/lsrmGraphToOtbImage.txx
+++ b/include/lsgrmGraphToOtbImage.txx
@@ -1,10 +1,10 @@
 #ifndef __LSRM_GRAPH_TO_OTBIMAGE_TXX
 #define __LSRM_GRAPH_TO_OTBIMAGE_TXX
-#include "lsrmGraphToOtbImage.h"
+#include "lsgrmGraphToOtbImage.h"
 #include "itkImageRegionIterator.h"
 #include "itkGrayscaleFillholeImageFilter.h"
 
-namespace lsrm
+namespace lsgrm
 {
 	template<class TGraph>
 	typename GraphToOtbImage<TGraph>::LabelImageType::Pointer
diff --git a/include/lsrmSegmenter.h b/include/lsgrmSegmenter.h
similarity index 97%
rename from include/lsrmSegmenter.h
rename to include/lsgrmSegmenter.h
index cc9a6a8..df488e0 100644
--- a/include/lsrmSegmenter.h
+++ b/include/lsgrmSegmenter.h
@@ -2,8 +2,8 @@
 #define __LSRM_SEGMENTER_H
 #include "macro-generator.h"
 #include "grmSegmenter.h"
-#include "lsrmGraphToOtbImage.h"
-namespace lsrm
+#include "lsgrmGraphToOtbImage.h"
+namespace lsgrm
 {
 template<class TSegmenterType>
 class Segmenter : public TSegmenterType
@@ -19,7 +19,7 @@ public:
   typedef typename GraphType::EdgeType EdgeType;
   typedef typename grm::GraphOperations<TSegmenterType> GraphOperatorType;
   typedef typename GraphOperatorType::NodePointerType NodePointerType;
-  typedef lsrm::GraphToOtbImage<GraphType> IOType;
+  typedef GraphToOtbImage<GraphType> IOType;
   typedef typename IOType::LabelImageType LabelImageType;
 
   ~Segmenter(){};
@@ -193,7 +193,7 @@ public:
   }
 
 };
-} // end of namespace lsrm
+} // end of namespace lsgrm
 
 #endif
 
diff --git a/include/lsrmBaatzSegmenter.h b/include/lsrmBaatzSegmenter.h
index 0f77cf6..d8a9376 100644
--- a/include/lsrmBaatzSegmenter.h
+++ b/include/lsrmBaatzSegmenter.h
@@ -1,9 +1,9 @@
 #ifndef __LSRM_BAATZ_SEGMENTER_H
 #define __LSRM_BAATZ_SEGMENTER_H
-#include "lsrmSegmenter.h"
+#include "lsgrmSegmenter.h"
 #include "grmBaatzSegmenter.h"
 
-namespace lsrm
+namespace lsgrm
 {
 
 template<class TImage>
diff --git a/include/lsrmBaatzSegmenter.txx b/include/lsrmBaatzSegmenter.txx
index df5614d..3a33759 100644
--- a/include/lsrmBaatzSegmenter.txx
+++ b/include/lsrmBaatzSegmenter.txx
@@ -3,7 +3,7 @@
 #include <otbImageFileReader.h>
 #include <itkImageRegionIterator.h>
 
-namespace lsrm
+namespace lsgrm
 {
 
 	template<class TImage>
-- 
GitLab