diff --git a/JPSvis.pro b/JPSvis.pro index f38f4f9d09e1b6a4b82da4ae364bc46aca15b4ae..80d4ea75025a7256390651f6eb07810c0dd379bf 100644 --- a/JPSvis.pro +++ b/JPSvis.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = TraVisTo +TARGET = JPSvis CONFIG += qt CONFIG += static CONFIG += c++11 @@ -13,7 +13,6 @@ 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 greaterThan(QT_MAJOR_VERSION, 4):QT += widgets @@ -385,7 +384,6 @@ LIBS += -L/usr/lib \ -lvtkDICOMParser \ -lvtkmetaio \ -lvtkftgl \ - #-lLSDyna \ -lvtkViews \ -lvtksys \ #-lvtkpng \ @@ -434,7 +432,7 @@ unix_static { -ldl \ } -macx { +macx{ INCLUDEPATH += /Users/piccolo/VTK/include/vtk-6.1 LIBS += -L/Users/piccolo/VTK/lib \ -lvtkalglib-6.1 \ diff --git a/src/ThreadVisualisation.cpp b/src/ThreadVisualisation.cpp index c72f596f674e439b7d32ebaba7de576c8f63036b..2688d607744e4dda42c922f3eb337f4da87f98ca 100644 --- a/src/ThreadVisualisation.cpp +++ b/src/ThreadVisualisation.cpp @@ -103,7 +103,7 @@ ThreadVisualisation::ThreadVisualisation(QObject *parent): renderer=NULL; renderWindow=NULL; renderWinInteractor=NULL; - runningTime=NULL; + runningTime=vtkTextActor::New();; framePerSecond=25; axis=NULL; winTitle="header without room caption"; @@ -124,6 +124,8 @@ ThreadVisualisation::~ThreadVisualisation() if(extern_glyphs_pedestrians_actor_2D) extern_glyphs_pedestrians_actor_2D->Delete(); if(extern_pedestrians_labels) extern_pedestrians_labels->Delete(); + runningTime->Delete(); + } void ThreadVisualisation::setFullsreen(bool status) @@ -242,7 +244,6 @@ void ThreadVisualisation::run() // initLegend(); //add the running time frame - runningTime = vtkTextActor::New(); runningTime->SetTextScaleModeToViewport(); //runningTime->SetTextScaleModeToProp(); //runningTime->SetMinimumSize(10,10); @@ -369,7 +370,6 @@ void ThreadVisualisation::run() renderWindow->Delete(); renderWinInteractor->Delete(); _topViewCamera->Delete(); - runningTime->Delete(); renderer=NULL; delete renderingTimer; @@ -803,7 +803,7 @@ void ThreadVisualisation::setGeometryVisibility3D(bool status) void ThreadVisualisation::setOnscreenInformationVisibility(bool show) { - if(runningTime) + //if(runningTime) runningTime->SetVisibility(show); }