diff --git a/JPSvis.pro b/JPSvis.pro index 602ec68da6f4d1414c9559dc8b8a680dfe701c41..7ce3134a5c24a94d618f2744b60461380553bbe6 100644 --- a/JPSvis.pro +++ b/JPSvis.pro @@ -13,16 +13,15 @@ QT += xml network #QMAKE_LFLAGS_RELEASE += -static-libgcc QMAKE_CXXFLAGS += -std=c++11 -QMAKE_CXXFLAGS += -Wno-deprecated -Wno-unused-parameter -Wno-unused-variable -Wno-sign-compare +QMAKE_CXXFLAGS += -Wno-deprecated -Wno-unused-parameter -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas greaterThan(QT_MAJOR_VERSION, 4):QT += widgets #Dynamic linking #Windows VTK 6.1 -win32_te { +win32_old { INCLUDEPATH += C:/VTK/VTK6.1/include LIBS += -LC:/VTK/VTK6.1/bin_shared \ - #LIBS += -LC:/VTK/bin_static/lib \ -lwsock32 \ -lvtkCommonCore-6.1 \ -lvtkRenderingOpenGL-6.1 \ @@ -66,7 +65,7 @@ win32_te { #Static linking #Windows VTK 6.1 -win32_6.1 { +win32_old { INCLUDEPATH += C:/VTK/VTK6.1/include LIBS += -LC:/VTK/VTK6.1/bin_static \ -lvtkCommonCore-6.1 \ @@ -183,14 +182,16 @@ win32_6.1 { -lvtkViewsInfovis-6.1 \ -lvtkViewsQt-6.1 \ -lvtkzlib-6.1 \ - -lwsock32 + -lwsock32 -lglu32 -lvfw32 -lgdi32 -lopengl32 -lws2_32 -lgdi32 \ + -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 \ + -luuid -lcomdlg32 -ladvapi32\ } #Dynamic linking #Windows VTK 5.10 -win32 { - INCLUDEPATH += C:/VTK/VTK5.1/include - LIBS += -LC:/VTK/VTK5.1/bin_shared \ +win32_old { + INCLUDEPATH += D:/VTK/VTK5.1/include + LIBS += -LD:/VTK/VTK5.1/bin_shared \ -lvtksys \ -lvtkzlib \ -lvtkjpeg \ @@ -216,32 +217,34 @@ win32 { -lvtkWidgets \ -lvtkInfovis\ -lvtkViews\ - -lwsock32\ + -lwsock32 -lglu32 -lvfw32 -lgdi32 -lopengl32 -lws2_32 -lgdi32 \ + -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 \ + -luuid -lcomdlg32 -ladvapi32\ } #Static linking #VTK 5.10 Windows -win32_static { - INCLUDEPATH += C:/VTK/VTK5.1/static_2/include/vtk-5.10 - LIBS += -LC:\VTK\VTK5.1\static_2\lib\vtk-5.10 \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkCharts.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkViews.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkInfovis.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkWidgets.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkHybrid.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkVolumeRendering.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkParallel.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkRendering.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkGraphics.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkverdict.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkImaging.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkIO.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkFiltering.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkDICOMParser.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkNetCDF_cxx.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkmetaio.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtksqlite.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkpng.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtktiff.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkjpeg.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkexpat.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libVPIC.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libCosmo.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkCommon.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libLSDyna.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtksys.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkexoIIc.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkNetCDF.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkhdf5_hl.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkhdf5.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtklibxml2.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkzlib.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkalglib.a C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkftgl.a \ - C:\VTK\VTK5.1\static_2\lib\vtk-5.10/libvtkfreetype.a \ +win32 { + INCLUDEPATH += C:/VTK/VTK5.1/static/include + LIBS += -LC:\VTK\VTK5.1\static\lib \ + C:\VTK\VTK5.1\static\bin/libvtkCharts.a C:\VTK\VTK5.1\static\bin/libvtkViews.a \ + C:\VTK\VTK5.1\static\bin/libvtkInfovis.a C:\VTK\VTK5.1\static\bin/libvtkWidgets.a \ + C:\VTK\VTK5.1\static\bin/libvtkHybrid.a C:\VTK\VTK5.1\static\bin/libvtkVolumeRendering.a \ + C:\VTK\VTK5.1\static\bin/libvtkRendering.a \ + C:\VTK\VTK5.1\static\bin/libvtkGraphics.a C:\VTK\VTK5.1\static\bin/libvtkverdict.a \ + C:\VTK\VTK5.1\static\bin/libvtkImaging.a C:\VTK\VTK5.1\static\bin/libvtkIO.a \ + C:\VTK\VTK5.1\static\bin/libvtkFiltering.a C:\VTK\VTK5.1\static\bin/libvtkDICOMParser.a \ + C:\VTK\VTK5.1\static\bin/libvtkNetCDF_cxx.a C:\VTK\VTK5.1\static\bin/libvtkmetaio.a \ + C:\VTK\VTK5.1\static\bin/libvtksqlite.a C:\VTK\VTK5.1\static\bin/libvtkpng.a \ + C:\VTK\VTK5.1\static\bin/libvtktiff.a C:\VTK\VTK5.1\static\bin/libvtkjpeg.a \ + C:\VTK\VTK5.1\static\bin/libvtkexpat.a \ + C:\VTK\VTK5.1\static\bin/libvtkCommon.a \ + C:\VTK\VTK5.1\static\bin/libLSDyna.a C:\VTK\VTK5.1\static\bin/libvtksys.a \ + C:\VTK\VTK5.1\static\bin/libvtkexoIIc.a C:\VTK\VTK5.1\static\bin/libvtkNetCDF.a \ + C:\VTK\VTK5.1\static\bin/libvtkhdf5_hl.a C:\VTK\VTK5.1\static\bin/libvtkhdf5.a \ + C:\VTK\VTK5.1\static\bin/libvtklibxml2.a C:\VTK\VTK5.1\static\bin/libvtkzlib.a \ + C:\VTK\VTK5.1\static\bin/libvtkalglib.a C:\VTK\VTK5.1\static\bin/libvtkftgl.a \ + C:\VTK\VTK5.1\static\bin/libvtkfreetype.a \ -lwsock32 -lglu32 -lvfw32 -lgdi32 -lopengl32 -lws2_32 -lgdi32 \ -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 \ -luuid -lcomdlg32 -ladvapi32\ diff --git a/src/Frame.cpp b/src/Frame.cpp index 8003b00b045aff86eae06b652ed08a05a171e011..4efecfdbb2b0911d70fda7cd73da34109fec9792 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -33,6 +33,7 @@ #include <vector> #include <iostream> +#include "general/Macros.h" #include "FrameElement.h" #include "Frame.h" #include <vtkPolyData.h> diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index c79afd01ffa42820f6555237cc8a9c925cd67f4a..3127cf2ca0b2a728206e44a42650e09d90e73de8 100755 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -275,9 +275,9 @@ void MainWindow::slotHelpAbout() QMessageBox::about( this, "About JPSVis", - "Version 0.6-alpha built with QT 4.8 and VTK 5.10\n\n" - "JPSVis is part of the Juelich Pedestrian Simulator (JuPdsim)" - "and stands for Trajectories Visualisation Tool. It is a tool for visualizing pedestrians motion\n" + "Version 0.6 built with QT 4.8 and VTK 5.10\n\n" + "JPSvis is part of the Juelich Pedestrian Simulator (JuPedsim)" + "It is a tool for visualizing pedestrians motion\n" "developped at the Forschungszentrum Juelich GmbH, Germany\n\n" "Copyright 2009-2014.\n" "Authors: Ulrich Kemloh\n\n" diff --git a/src/Pedestrian.cpp b/src/Pedestrian.cpp index cc719c5b511d107a66437f204693cc4e90448e56..5acf570ee132f4d49d8bf72ca29284de93ec783b 100644 --- a/src/Pedestrian.cpp +++ b/src/Pedestrian.cpp @@ -38,7 +38,7 @@ #include "forms/Settings.h" #include "SystemSettings.h" #include "TrajectoryPoint.h" - +#include "general/Macros.h" #include <vtkActor.h> #include <vtkCylinderSource.h> diff --git a/src/TimerCallback.cpp b/src/TimerCallback.cpp index 708e2110cb6ae541a22a2800798789f2f2aae5a1..6175b8649837c5407915e285ae1d79791573aaa5 100644 --- a/src/TimerCallback.cpp +++ b/src/TimerCallback.cpp @@ -52,6 +52,8 @@ #endif #endif +#include "general/Macros.h" + #include <QObject> #include <QString> #include <QTime> diff --git a/src/general/Macros.h b/src/general/Macros.h index 3558ee36d09b3a6573e5b305cb7243485be09bd5..fca874fa65a331ae4aebb3c9a248f45699e0706b 100644 --- a/src/general/Macros.h +++ b/src/general/Macros.h @@ -37,11 +37,13 @@ #include <algorithm> #include <sstream> - +#ifndef M_PI #define _USE_MATH_DEFINES #include <math.h> #define M_PI 3.14159265358979323846 +#endif +#define _isnan(x) std::isnan(x) // should be true only when using this file in the simulation core //#define _SIMULATOR 1 diff --git a/src/geometry/JPoint.cpp b/src/geometry/JPoint.cpp index 484f4fb9b965850c10fab8466b2b7c9cdcf9ef72..c835a61e137c274295519cd3a917fb7a653d102d 100644 --- a/src/geometry/JPoint.cpp +++ b/src/geometry/JPoint.cpp @@ -32,8 +32,10 @@ #include "JPoint.h" #include "../Debug.h" -#include <vtkMath.h> +#include "../general/Macros.h" #include <math.h> +#include <vtkMath.h> + #include <cstdio> #include <cstdlib> diff --git a/src/main.cpp b/src/main.cpp index e9ee6beef22a236e39d80a488f84bea369a5e9e7..3897a4c4eab663df54677b64431f7dd1df73d701 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,8 +52,10 @@ #undef VTK_USE_FFMPEG -#include <QApplication> #include "MainWindow.h" + +#include <QApplication> +#include <QDir> #include <locale.h> @@ -66,8 +68,12 @@ int main(int argc, char *argv[]) //setlocale(LC_NUMERIC, "en_US" ); setlocale(LC_NUMERIC,"C"); + //force the application to first looks for privated libs + a.addLibraryPath(QApplication::applicationDirPath() + + QDir::separator() + + "lib"); + MainWindow w; w.show(); - return a.exec(); }