From 1b90266b2aa5d682bf9ca803d5934287711cdb63 Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Fri, 24 Apr 2015 11:09:29 +0200
Subject: [PATCH] moved VtkOGSEnum to MeshLib
---
Applications/DataExplorer/VtkVis/VtkMeshSource.cpp | 4 ++--
InSituLib/VtkMappedMesh.cpp | 1 -
{InSituLib => MeshLib}/VtkOGSEnum.cpp | 4 ----
{InSituLib => MeshLib}/VtkOGSEnum.h | 5 -----
4 files changed, 2 insertions(+), 12 deletions(-)
rename {InSituLib => MeshLib}/VtkOGSEnum.cpp (98%)
rename {InSituLib => MeshLib}/VtkOGSEnum.h (91%)
diff --git a/Applications/DataExplorer/VtkVis/VtkMeshSource.cpp b/Applications/DataExplorer/VtkVis/VtkMeshSource.cpp
index 0a4b46865dc..fd9aceddf34 100644
--- a/Applications/DataExplorer/VtkVis/VtkMeshSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkMeshSource.cpp
@@ -45,7 +45,7 @@
#include <vtkTriangle.h>
#include <vtkWedge.h> // == Prism
-#include "InSituLib/VtkOGSEnum.h"
+#include "MeshLib/VtkOGSEnum.h"
vtkStandardNewMacro(VtkMeshSource);
@@ -146,7 +146,7 @@ int VtkMeshSource::RequestData( vtkInformation* request,
for (unsigned j = 0; j < nElemNodes; ++j)
point_ids->SetId(j, elem->getNode(j)->getID());
- type = InSituLib::OGSToVtkCellType(elem->getCellType());
+ type = OGSToVtkCellType(elem->getCellType());
if (type==0) {
ERR("VtkMeshSource::RequestData(): Unknown element type \"%s\".",
CellType2String(elem->getCellType()).c_str());
diff --git a/InSituLib/VtkMappedMesh.cpp b/InSituLib/VtkMappedMesh.cpp
index 9672d07626f..2dcb4d37a2d 100644
--- a/InSituLib/VtkMappedMesh.cpp
+++ b/InSituLib/VtkMappedMesh.cpp
@@ -28,7 +28,6 @@
#include "Element.h"
#include "MeshLib/Node.h"
#include "MeshEnums.h"
-
#include "VtkOGSEnum.h"
namespace InSituLib {
diff --git a/InSituLib/VtkOGSEnum.cpp b/MeshLib/VtkOGSEnum.cpp
similarity index 98%
rename from InSituLib/VtkOGSEnum.cpp
rename to MeshLib/VtkOGSEnum.cpp
index c74cf456d01..bf5df21beb6 100644
--- a/InSituLib/VtkOGSEnum.cpp
+++ b/MeshLib/VtkOGSEnum.cpp
@@ -11,9 +11,6 @@
#include <vtkCellType.h>
-namespace InSituLib
-{
-
CellType VtkCellTypeToOGS(int type)
{
CellType ogs;
@@ -139,5 +136,4 @@ int OGSToVtkCellType(CellType ogs)
return type;
}
-} // end namespace
diff --git a/InSituLib/VtkOGSEnum.h b/MeshLib/VtkOGSEnum.h
similarity index 91%
rename from InSituLib/VtkOGSEnum.h
rename to MeshLib/VtkOGSEnum.h
index c8f86db385e..571aee26bf9 100644
--- a/InSituLib/VtkOGSEnum.h
+++ b/MeshLib/VtkOGSEnum.h
@@ -12,13 +12,8 @@
#include "MeshEnums.h"
-namespace InSituLib
-{
-
CellType VtkCellTypeToOGS(int type);
int OGSToVtkCellType(CellType ogs);
-} // end namespace
-
#endif // VTKOGSENUM_H_
--
GitLab