diff --git a/JPSvis.pro b/JPSvis.pro index 7b394946f5e4d95b1da4b797ebc3f6dac1e9ccfa..d2ad56ed47a8027edb17e861a94d1c19df29f1a1 100644 --- a/JPSvis.pro +++ b/JPSvis.pro @@ -9,6 +9,7 @@ QT += xml network #QMAKE_LFLAGS += -static-libstdc++ -lstdc++ #QMAKE_CXXFLAGS += -static -static -static-libstdc++ #QMAKE_CXXFLAGS += -static +#QMAKE_LFLAGS_RELEASE += -static-libgcc greaterThan(QT_MAJOR_VERSION, 4):QT += widgets @@ -57,47 +58,9 @@ win32_te { -lvtkInteractionStyle-6.1 \ -lvtkCommonCore-6.1 \ -lvtksys-6.1 \ -#second round -# -lvtksys-6.1 \ -# -lvtkRenderingOpenGL-6.1 \ -# -lvtkCommonCore-6.1 \ -# -lvtkCommonDataModel-6.1 \ -# -lvtkCommonMath-6.1 \ -# -lvtkCommonMisc-6.1 \ -# -lvtkCommonSystem-6.1 \ -# -lvtkCommonTransforms-6.1 \ -# -lvtkCommonExecutionModel-6.1 \ -# -lvtkImagingHybrid-6.1 \ -# -lvtkIOImage-6.1 \ -# -lvtkDICOMParser-6.1 \ -# -lvtkjpeg-6.1 \ -# -lvtkmetaio-6.1 \ -# -lvtkzlib-6.1 \ -# -lvtkpng-6.1 \ -# -lvtktiff-6.1 \ -# -lvtkRenderingCore-6.1 \ -# -lvtkCommonComputationalGeometry-6.1 \ -# -lvtkFiltersCore-6.1 \ -# -lvtkFiltersExtraction-6.1 \ -# -lvtkFiltersGeneral-6.1 \ -# -lvtkFiltersStatistics-6.1 \ -# -lvtkalglib-6.1 \ -# -lvtkImagingFourier-6.1 \ -# -lvtkImagingCore-6.1 \ -# -lvtkFiltersGeometry-6.1 \ -# -lvtkFiltersSources-6.1 \ -# -lvtkRenderingLabel-6.1 \ -# -lvtkRenderingFreeType-6.1 \ -# -lvtkfreetype-6.1 \ -# -lvtkftgl-6.1 \ -# -lvtkRenderingFreeTypeOpenGL-6.1 \ -# -lvtkRenderingAnnotation-6.1 \ -# -lvtkIOMovie-6.1 \ -# -lvtkoggtheora-6.1 \ -# -lvtkInteractionStyle-6.1 \ } -#Satic linking +#Static linking #Windows VTK 6.1 win32_6.1 { INCLUDEPATH += C:/VTK/VTK6.1/include @@ -304,7 +267,6 @@ win32_old { unix_6 { INCLUDEPATH += /usr/local/include/vtk-6.0 - LIBS += -L/usr/local/lib/ \ -lvtkalglib-6.0 \ -lvtkChartsCore-6.0 \ @@ -475,7 +437,7 @@ LIBS += -L/usr/local/lib/vtk-5.10 \ -lvtkDICOMParser \ -lvtkmetaio \ -lvtkftgl \ -#-lLSDyna \ +-lLSDyna \ -lvtkViews \ -lvtksys \ -lvtkpng \ diff --git a/src/ThreadVisualisation.cpp b/src/ThreadVisualisation.cpp index 2bcce0fd6f4269572a8d5ca5714a81cfbd442d82..f40ea417f1969004d776ec1d5fa8a8e9b8f743bf 100644 --- a/src/ThreadVisualisation.cpp +++ b/src/ThreadVisualisation.cpp @@ -141,7 +141,7 @@ void ThreadVisualisation::slotSetFrameRate(float fps){ void ThreadVisualisation::run(){ //deactivate the output windows - //vtkObject::GlobalWarningDisplayOff(); + vtkObject::GlobalWarningDisplayOff(); //emit signalStatusMessage("running"); diff --git a/src/TimerCallback.cpp b/src/TimerCallback.cpp index ed8336f9ef286a55e6c512eb7c5bae89b88bfe52..13d57b866645627475b6121e641e7522fb78cb71 100644 --- a/src/TimerCallback.cpp +++ b/src/TimerCallback.cpp @@ -150,7 +150,6 @@ void TimerCallback::Execute(vtkObject *caller, unsigned long eventId, } else { - frameNumber=extern_trajectories_firstSet.getFrameCursor(); nPeds= frame->getSize();