From d094bec31b94be7ea1f8640e5625c0d8b745855c Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Mon, 20 Apr 2015 14:44:55 +0200
Subject: [PATCH] [MeshGeoToolsLib] Put GeoMapper in namespace.
---
Applications/DataExplorer/mainwindow.cpp | 2 +-
MeshGeoToolsLib/GeoMapper.cpp | 7 +++----
MeshGeoToolsLib/GeoMapper.h | 5 ++++-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index c1fd34e4cb3..19accd45c5b 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -821,7 +821,7 @@ void MainWindow::mapGeometry(const std::string &geo_name)
settings.setValue("lastOpenedFileDirectory", dir.absolutePath());
}
- GeoMapper geo_mapper(*_project.getGEOObjects(), geo_name);
+ MeshGeoToolsLib::GeoMapper geo_mapper(*_project.getGEOObjects(), geo_name);
QFileInfo fi(file_name);
if (choice == 1) // load raster from file
{
diff --git a/MeshGeoToolsLib/GeoMapper.cpp b/MeshGeoToolsLib/GeoMapper.cpp
index 9a50b71337f..4a6131b0056 100644
--- a/MeshGeoToolsLib/GeoMapper.cpp
+++ b/MeshGeoToolsLib/GeoMapper.cpp
@@ -34,6 +34,8 @@
#include "MeshLib/MeshSurfaceExtraction.h"
#include "MeshLib/MeshEditing/projectMeshOntoPlane.h"
+namespace MeshGeoToolsLib {
+
GeoMapper::GeoMapper(GeoLib::GEOObjects &geo_objects, const std::string &geo_name)
: _geo_objects(geo_objects), _geo_name(const_cast<std::string&>(geo_name)), _mesh(nullptr), _grid(nullptr), _raster(nullptr)
{
@@ -366,8 +368,5 @@ double GeoMapper::getMaxSegmentLength(const std::vector<GeoLib::Polyline*> &line
return max_segment_length;
}
-
-
-
-
+} // end namespace MeshGeoToolsLib
diff --git a/MeshGeoToolsLib/GeoMapper.h b/MeshGeoToolsLib/GeoMapper.h
index 14bd26c4497..bda12e77853 100644
--- a/MeshGeoToolsLib/GeoMapper.h
+++ b/MeshGeoToolsLib/GeoMapper.h
@@ -34,6 +34,8 @@ namespace GeoLib {
class Raster;
}
+namespace MeshGeoToolsLib {
+
/**
* \brief A set of tools for mapping the elevation of geometric objects
*/
@@ -89,7 +91,8 @@ private:
/// only necessary for mapping on DEM
GeoLib::Raster *_raster;
-
};
+} // end namespace MeshGeoToolsLib
+
#endif //GEOMAPPER_H
--
GitLab