Convert project structure

* From app to subdirs
* Add test folder

jpseditor.pro

- # This file is part of JuPedSim.
- #
- # JuPedSim is free software: you can redistribute it and/or modify
- # it under the terms of the GNU Lesser General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # any later version.
- #
- # JuPedSim is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU Lesser General Public License
- # along with JuPedSim. If not, see <http://www.gnu.org/licenses/>.
- #
- # copyright   <2009-2018> Forschungszentrum Juelich GmbH.
+TEMPLATE = subdirs
 
- # Compatibility with Qt4 and Qt5
-greaterThan(QT_MAJOR_VERSION, 4):QT += widgets
+CONFIG+=ordered
 
-TEMPLATE = app
-TARGET = JPSeditor
-
-CONFIG += qt xml gui;
-CONFIG += c++11
-
-QMAKE_CXXFLAGS += -std=c++11
-QMAKE_CXXFLAGS += -static
-#QMAKE_CXXFLAGS += -static-libgcc
-#QMAKE_CXXFLAGS += -static-libstdc++
-
-#QMAKE_CXXFLAGS_WARN_ON = -Wall -Wno-unused-parameter
-
-
-
-FORMS += \
-    forms/mainwindow.ui \
-    forms/roomwidget.ui \
-    forms/widgetlandmark.ui \
-    forms/widgetsettings.ui \
-    forms/inifilewidget.ui \
-    forms/settingdialog.ui
-
-HEADERS += \
-    src/mainWindow.h \
-    src/GraphicView.h \
-    src/roomwidget.h \
-    src/rooms.h \
-    src/datamanager.h \
-    src/jpscrossing.h \
-    src/jpsLineItem.h \
-    src/jpsexit.h \
-    src/jpsobstacle.h \
-    src/jpslandmark.h \
-    dxflib/src/dl_writer_ascii.h \
-    dxflib/src/dl_writer.h \
-    dxflib/src/dl_global.h \
-    dxflib/src/dl_extrusion.h \
-    dxflib/src/dl_exception.h \
-    dxflib/src/dl_entities.h \
-    dxflib/src/dl_dxf.h \
-    dxflib/src/dl_creationinterface.h \
-    dxflib/src/dl_creationadapter.h \
-    dxflib/src/dl_codes.h \
-    dxflib/src/dl_attributes.h \
-    src/widgetlandmark.h \
-    src/graphicscene.h \
-    src/widgetsettings.h \
-    src/jpsconnection.h \
-    src/UndoFramework/actionstack.h \
-    src/UndoFramework/action.h \
-    src/UndoFramework/lineaction.h \
-    src/jpsregion.h \
-    src/AutomaticRoomIdentification/roomID.h\
-    src/AutomaticRoomIdentification/roomdefinition.h \
-    src/AutomaticRoomIdentification/roomidentification.h \
-    src/dtrace.h \
-    src/settingdialog.h \
-    src/tinyxml/tinystr.h \
-    src/tinyxml/tinyxml.h \
-    src/inifilewidget.h \
-
-
-SOURCES += \
-    src/mainWindow.cpp \
-    src/main.cpp \
-    src/GraphicView.cpp \
-    src/roomwidget.cpp \
-    src/rooms.cpp \
-    src/datamanager.cpp \
-    src/jpscrossing.cpp \
-    src/jpsLineItem.cpp \
-    src/jpsexit.cpp \
-    src/jpsobstacle.cpp \
-    src/jpslandmark.cpp \
-    dxflib/src/dl_writer_ascii.cpp \
-    dxflib/src/dl_dxf.cpp \
-    src/widgetlandmark.cpp \
-    src/graphicscene.cpp \
-    src/widgetsettings.cpp \
-    src/jpsconnection.cpp \
-    src/UndoFramework/actionstack.cpp \
-    src/UndoFramework/action.cpp \
-    src/UndoFramework/lineaction.cpp \
-    src/jpsregion.cpp \
-    src/AutomaticRoomIdentification/roomdefinition.cpp \
-    src/AutomaticRoomIdentification/roomidentification.cpp \
-    src/settingdialog.cpp \
-    src/tinyxml/tinystr.cpp \
-    src/tinyxml/tinyxml.cpp \
-    src/tinyxml/tinyxmlerror.cpp \
-    src/tinyxml/tinyxmlparser.cpp \
-    src/inifilewidget.cpp \
-
-
-#INCLUDEPATH += D:/boost_1_59_0/boost_1_59_0
-
-RESOURCES += \
-    Resources/resources.qrc
-
-RC_FILE = Resources/jpseditor.rc
-#osx fix
-ICON = Resources/jpseditor.icns
-#INCLUDEPATH += $$(ROOTSYS)/include
-
-CONFIG(debug, debug|release) {
-    DESTDIR = build/debug
-}
-CONFIG(release, debug|release) {
-    DESTDIR = build/release
-}
-
-OBJECTS_DIR = $$DESTDIR/.obj
-MOC_DIR = $$DESTDIR/.moc
-RCC_DIR = $$DESTDIR/.qrc
-UI_DIR = $$DESTDIR/.u
-
-demos.path = /usr/local/bin/jpseditor
-demos.files = examples/*
-
-INSTALLS += demos
-
-target.path = /usr/local/bin/jpseditor
-INSTALLS += target
+SUBDIRS = \
+    src \

src/datamanager.h

@@ -44,8 +44,8 @@
 #include "jpsregion.h"
 #include <random>
 
-#include "../dxflib/src/dl_creationadapter.h"
-#include "../dxflib/src/dl_dxf.h"
+#include "dxflib/src/dl_creationadapter.h"
+#include "dxflib/src/dl_dxf.h"
 
 
 using ptrConnection = std::shared_ptr<jpsConnection>;