From 8ec8df121363cf471c6589c38aae3dbe867d210f Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Wed, 6 Mar 2019 08:02:19 +0100
Subject: [PATCH] [A/DE/DV] Add gmsh path necessary for MS Windows.
---
Applications/DataExplorer/DataView/GEOModels.cpp | 12 +++++-------
Applications/DataExplorer/DataView/GEOModels.h | 4 ++--
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Applications/DataExplorer/DataView/GEOModels.cpp b/Applications/DataExplorer/DataView/GEOModels.cpp
index 08115fe81ea..3f9c83934d4 100644
--- a/Applications/DataExplorer/DataView/GEOModels.cpp
+++ b/Applications/DataExplorer/DataView/GEOModels.cpp
@@ -158,12 +158,9 @@ void GEOModels::renameGeometry(std::string const& old_name,
}
void GEOModels::connectPolylineSegments(
- const std::string& geoName,
- std::vector<std::size_t> const& indexlist,
- double const proximity,
- std::string const& ply_name,
- bool const closePly,
- bool const triangulatePly)
+ const std::string& geoName, std::vector<std::size_t> const& indexlist,
+ double const proximity, std::string const& ply_name, bool const closePly,
+ bool const triangulatePly, std::string const& gmsh_path)
{
GeoLib::PolylineVec* plyVec = _geo_objects.getPolylineVecObj(geoName);
@@ -196,7 +193,8 @@ void GEOModels::connectPolylineSegments(
INFO(
"Creating a surface by triangulation of the polyline "
"...");
- if (FileIO::createSurface(*new_line, _geo_objects, geoName))
+ if (FileIO::createSurface(*new_line, _geo_objects, geoName,
+ gmsh_path))
{
INFO("\t done");
}
diff --git a/Applications/DataExplorer/DataView/GEOModels.h b/Applications/DataExplorer/DataView/GEOModels.h
index e685d055153..525cc21cea6 100644
--- a/Applications/DataExplorer/DataView/GEOModels.h
+++ b/Applications/DataExplorer/DataView/GEOModels.h
@@ -94,8 +94,8 @@ public slots:
std::vector<std::size_t> const& indexlist,
double const proximity,
std::string const& ply_name,
- bool const closePly,
- bool const triangulatePly);
+ bool const closePly, bool const triangulatePly,
+ std::string const& gmsh_path);
protected:
GeoTreeModel* _geoModel;
--
GitLab