From c20f71edfc12f4b5887d2ac6634d3da49779a1e0 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Sat, 13 Apr 2019 15:22:43 +0200
Subject: [PATCH] add full path to aux files
---
src/MainWindow.cpp | 4 ++--
src/SaxParser.cpp | 2 ++
src/geometry/Building.cpp | 6 ++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index b07999f..8a15fcc 100755
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -854,8 +854,8 @@ bool MainWindow::addPedestrianGroup(int groupID,QString fileName)
// try to parse the txt file
else if(fileName.endsWith(".txt",Qt::CaseInsensitive))
{
- QString source_file=SaxParser::extractSourceFileTXT(fileName);
- QString goal_file=SaxParser::extractGoalFileTXT(fileName);
+ QString source_file= wd + QDir::separator() + SaxParser::extractSourceFileTXT(fileName);
+ QString goal_file=wd + QDir::separator() + SaxParser::extractGoalFileTXT(fileName);
QFileInfo check_file(source_file);
if( !(check_file.exists() && check_file.isFile()) )
{
diff --git a/src/SaxParser.cpp b/src/SaxParser.cpp
index 0b75fa5..55ae81d 100644
--- a/src/SaxParser.cpp
+++ b/src/SaxParser.cpp
@@ -706,6 +706,8 @@ bool SaxParser::parseGeometryJPS(QString fileName, GeometryFactory& geoFac)
Debug::Messages("wd: <%s>",wd.toStdString().c_str());
Building* building = new Building();
string geometrypath = fileName.toStdString();
+ building->SetProjectRootDir(wd.toStdString());
+
// read the geometry
if(!building->LoadGeometry(geometrypath))
return false;
diff --git a/src/geometry/Building.cpp b/src/geometry/Building.cpp
index a5a00f2..482384d 100644
--- a/src/geometry/Building.cpp
+++ b/src/geometry/Building.cpp
@@ -350,10 +350,12 @@ const std::string& Building::GetGeometryFilename() const
bool Building::LoadGeometry(const std::string &geometryfile)
{
//get the geometry filename from the project file
- string geoFilenameWithPath= _projectRootDir + geometryfile;
+ string geoFilenameWithPath= geometryfile; //_projectRootDir +
+
Debug::Messages("LoadGeometry: Root Dir: <%s>", _projectRootDir.c_str());
Debug::Messages("LoadGeometry: geometryfile: <%s>", geometryfile.c_str());
Debug::Messages("LoadGeometry: geoFilenameWithPath: <%s>", geoFilenameWithPath.c_str());
+
if(geometryfile=="")
{
TiXmlDocument doc(_projectFilename);
@@ -587,7 +589,7 @@ bool Building::LoadGeometry(const std::string &geometryfile)
TiXmlNode * xNodeFile = xTransNode->FirstChild("file");
if(xNodeFile)
{
- std::string transFilename = xNodeFile->FirstChild()->ValueStr();
+ std::string transFilename = _projectRootDir + "/" +xNodeFile->FirstChild()->ValueStr();
Log->Write("INFO:\tParsing transition from file <%s>", transFilename.c_str());
TiXmlDocument docTrans(transFilename);
if (!docTrans.LoadFile()) {
--
GitLab