From c721a063a31eedc11a7c143dbe8c3cdf4473734d Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Mon, 3 Sep 2012 17:00:42 +0200
Subject: [PATCH] fixed msheditor namespace changes
---
FileIO/XmlIO/VTKInterface.cpp | 2 +-
Gui/DataView/DirectConditionGenerator.cpp | 2 +-
Gui/DataView/MshLayerMapper.cpp | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/FileIO/XmlIO/VTKInterface.cpp b/FileIO/XmlIO/VTKInterface.cpp
index 4381d33ba0c..710a6db67e4 100644
--- a/FileIO/XmlIO/VTKInterface.cpp
+++ b/FileIO/XmlIO/VTKInterface.cpp
@@ -53,7 +53,7 @@ MeshLib::Mesh* VTKInterface::readVTUFile(const std::string &file_name)
}
in.seekg(0, std::ios::end);
- size_t length = in.tellg();
+ const size_t length = in.tellg();
in.seekg(0, std::ios::beg);
char* buffer = new char[length+1];
in.read(buffer, length);
diff --git a/Gui/DataView/DirectConditionGenerator.cpp b/Gui/DataView/DirectConditionGenerator.cpp
index 38d8fcf9569..4f25983ca52 100644
--- a/Gui/DataView/DirectConditionGenerator.cpp
+++ b/Gui/DataView/DirectConditionGenerator.cpp
@@ -32,7 +32,7 @@ const std::vector< std::pair<size_t,double> >& DirectConditionGenerator::directT
return _direct_values;
}
- const std::vector<GeoLib::PointWithID*> surface_nodes ( MshEditor::getSurfaceNodes(mesh) );
+ const std::vector<GeoLib::PointWithID*> surface_nodes ( MeshLib::MshEditor::getSurfaceNodes(mesh) );
//std::vector<MeshLib::CNode*> nodes = mesh.nod_vector;
const size_t nNodes(surface_nodes.size());
_direct_values.reserve(nNodes);
diff --git a/Gui/DataView/MshLayerMapper.cpp b/Gui/DataView/MshLayerMapper.cpp
index e8197fe8749..6716b972e47 100644
--- a/Gui/DataView/MshLayerMapper.cpp
+++ b/Gui/DataView/MshLayerMapper.cpp
@@ -187,7 +187,8 @@ int MshLayerMapper::LayerMapping(MeshLib::Mesh* new_mesh, const std::string &ras
{
std::cout << "Warning: Removing " << noData_nodes.size()
<< " mesh nodes at NoData values ... " << std::endl;
- MeshLib::Mesh* red_mesh = MshEditor::removeMeshNodes(new_mesh, noData_nodes);
+ MeshLib::MshEditor msh_editor;
+ MeshLib::Mesh* red_mesh = msh_editor.removeMeshNodes(new_mesh, noData_nodes);
if (new_mesh->getNElements() == 0)
{
delete new_mesh;
--
GitLab