[MERGE]

LiDARToolbox/src/WToolkit.cpp

@@ -33,7 +33,7 @@
 #include "buildingsDetection/WMBuildingsDetection.h"
 #include "buildingsDetectionByPCA/WMBuildingsDetectionByPCA.h"
 #include "elevationImageExport/WMElevationImageExport.h"
-#include "pointsCrop/WMPointsCrop.h"
+#include "pointsTransform/WMPointsTransform.h"
 #include "pointsCutOutliers/WMPointsCutOutliers.h"
 #include "pointsGroupSelector/WMPointsGroupSelector.h"
 #include "readLAS/WMReadLAS.h"
@@ -58,9 +58,9 @@ extern "C" void WLoadModule( WModuleList& m ) // NOLINT
     m.push_back( boost::shared_ptr< WModule >( new WMBuildingsDetection ) );
     m.push_back( boost::shared_ptr< WModule >( new WMBuildingsDetectionByPCA ) );
     m.push_back( boost::shared_ptr< WModule >( new WMElevationImageExport ) );
-    m.push_back( boost::shared_ptr< WModule >( new WMPointsCrop ) );
     m.push_back( boost::shared_ptr< WModule >( new WMPointsCutOutliers ) );
     m.push_back( boost::shared_ptr< WModule >( new WMPointsGroupSelector ) );
+    m.push_back( boost::shared_ptr< WModule >( new WMPointsTransform ) );
     m.push_back( boost::shared_ptr< WModule >( new WMReadLAS ) );
     m.push_back( boost::shared_ptr< WModule >( new WMSurfaceDetectionByLari ) );
     m.push_back( boost::shared_ptr< WModule >( new WMSurfaceDetectionByPCL ) );

LiDARToolbox/src/buildingsDetection/WBuildingDetector.h

@@ -28,10 +28,10 @@
 #include <vector>
 #include "core/graphicsEngine/WTriangleMesh.h"
 #include "core/dataHandler/WDataSetPoints.h"
-#include "../datastructures/octree/WOctNode.h"
-#include "../datastructures/quadtree/WQuadNode.h"
-#include "../datastructures/quadtree/WQuadTree.h"
-#include "../datastructures/octree/WOctree.h"
+#include "../common/datastructures/octree/WOctNode.h"
+#include "../common/datastructures/quadtree/WQuadNode.h"
+#include "../common/datastructures/quadtree/WQuadTree.h"
+#include "../common/datastructures/octree/WOctree.h"
 
 /**
  * Class that detects buildings using the WDataSetPoints

LiDARToolbox/src/buildingsDetection/WMBuildingsDetection.cpp

@@ -42,7 +42,7 @@
 #include "WMBuildingsDetection.xpm"
 #include "WMBuildingsDetection.h"
 #include "WBuildingDetector.h"
-#include "../datastructures/octree/WOctree.h"
+#include "../common/datastructures/octree/WOctree.h"
 
 // This line is needed by the module loader to actually find your module.
 //W_LOADABLE_MODULE( WMBuildingsDetection )

LiDARToolbox/src/buildingsDetection/WMBuildingsDetection.h

@@ -42,10 +42,10 @@
 #include <osg/ShapeDrawable>
 #include <osg/Geode>
 #include "core/dataHandler/WDataSetPoints.h"
-#include "../datastructures/octree/WOctree.h"
-#include "../datastructures/quadtree/WQuadTree.h"
+#include "../common/datastructures/octree/WOctree.h"
+#include "../common/datastructures/quadtree/WQuadTree.h"
 
-#include "../datastructures/WDataSetPointsGrouped.h"
+#include "../common/datastructures/WDataSetPointsGrouped.h"
 
 
 

LiDARToolbox/src/buildingsDetectionByPCA/WMBuildingsDetectionByPCA.cpp

@@ -42,7 +42,7 @@
 #include "WMBuildingsDetectionByPCA.xpm"
 #include "WMBuildingsDetectionByPCA.h"
 #include "WPCADetector.h"
-#include "../datastructures/octree/WOctree.h"
+#include "../common/datastructures/octree/WOctree.h"
 
 // This line is needed by the module loader to actually find your module.
 //W_LOADABLE_MODULE( WMBuildingsDetectionByPCA )

LiDARToolbox/src/buildingsDetectionByPCA/WMBuildingsDetectionByPCA.h

@@ -42,10 +42,10 @@
 #include <osg/ShapeDrawable>
 #include <osg/Geode>
 #include "core/dataHandler/WDataSetPoints.h"
-#include "../datastructures/octree/WOctree.h"
-#include "../datastructures/quadtree/WQuadTree.h"
+#include "../common/datastructures/octree/WOctree.h"
+#include "../common/datastructures/quadtree/WQuadTree.h"
 
-#include "../datastructures/WDataSetPointsGrouped.h"
+#include "../common/datastructures/WDataSetPointsGrouped.h"
 
 
 

LiDARToolbox/src/buildingsDetectionByPCA/WPCADetector.h

@@ -28,10 +28,10 @@
 #include <vector>
 #include "core/graphicsEngine/WTriangleMesh.h"
 #include "core/dataHandler/WDataSetPoints.h"
-#include "../datastructures/octree/WOctNode.h"
-#include "../datastructures/quadtree/WQuadNode.h"
-#include "../datastructures/quadtree/WQuadTree.h"
-#include "../datastructures/octree/WOctree.h"
+#include "../common/datastructures/octree/WOctNode.h"
+#include "../common/datastructures/quadtree/WQuadNode.h"
+#include "../common/datastructures/quadtree/WQuadTree.h"
+#include "../common/datastructures/octree/WOctree.h"
 #include "structure/WPcaDetectOctNode.h"
 #include "core/common/math/principalComponentAnalysis/WPrincipalComponentAnalysis.h"
 #include "core/common/WProgress.h"

LiDARToolbox/src/buildingsDetectionByPCA/structure/WPcaDetectOctNode.h

@@ -26,7 +26,7 @@
 #ifndef WPCADETECTOCTNODE_H
 #define WPCADETECTOCTNODE_H
 #include <vector>
-#include "../../datastructures/octree/WOctNode.h"
+#include "../../common/datastructures/octree/WOctNode.h"
 #include "core/common/math/linearAlgebra/WPosition.h"
 #include "core/dataHandler/WDataSetPoints.h"