From 70f343518058ce403f379c462db8b5a0f8311ad5 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Fri, 5 Apr 2019 18:06:50 +0200
Subject: [PATCH] update gitignore
---
.gitignore | 6 ++++--
src/SaxParser.cpp | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9f5d0fa..111ee1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-
# Created by https://www.gitignore.io/api/c++,clion,emacs,cmake
# Edit at https://www.gitignore.io/?templates=c++,clion,emacs,cmake
@@ -184,4 +183,7 @@ flycheck_*.el
# End of https://www.gitignore.io/api/c++,clion,emacs,cmake
-.idea/*
\ No newline at end of file
+.idea/*
+
+.vscode/
+build*
diff --git a/src/SaxParser.cpp b/src/SaxParser.cpp
index 1cd0f61..585686f 100644
--- a/src/SaxParser.cpp
+++ b/src/SaxParser.cpp
@@ -680,12 +680,14 @@ bool SaxParser::parseGeometryJPS(QString fileName, GeometryFactory& geoFac)
double captionsColor=0;//red
if(!fileName.endsWith(".xml",Qt::CaseInsensitive)) return false;
QString wd;
+ QDir dir(wd);
SystemSettings::getWorkingDirectory(wd);
- fileName=wd + "/" + fileName; //TODO: is this windows compatible?
+ QString s = dir.relativeFilePath(fileName);
+ fileName=wd + QDir::separator() + s;
// QString = QDir::cleanPath(wd + QDir::separator() + fileName);
Debug::Messages("filename: <%s)", fileName.toStdString().c_str());
Debug::Messages("wd: <%s>",wd.toStdString().c_str());
- Debug::Messages("filename2: <%s>",fileName.toStdString().c_str());
+
Building* building = new Building();
string geometrypath = fileName.toStdString();
// read the geometry
--
GitLab