diff --git a/JPSvis.pro b/JPSvis.pro index b74510598845b27da683e5044caa9866e0c76de0..6e1453b8d8d8b0f69961acafe6f948fb55368710 100644 --- a/JPSvis.pro +++ b/JPSvis.pro @@ -385,7 +385,7 @@ unix_6 { } #dynamic linking with vtk5.10 -unix { +unix_dyn { INCLUDEPATH += /usr/include/vtk-5.8 LIBS += -L/usr/lib \ #INCLUDEPATH +=/usr/local/include/vtk-5.10 @@ -418,7 +418,7 @@ LIBS += -L/usr/lib \ } #Static compilation linux -unix_static { +unix { #INCLUDEPATH += /usr/include/vtk-5.8 #LIBS += -L/usr/lib \ INCLUDEPATH +=/usr/local/include/vtk-5.10 diff --git a/JPSvisSettings.xml b/JPSvisSettings.xml deleted file mode 100644 index a33e5ba9fd59b738bb42cfa1447660d57bd5e778..0000000000000000000000000000000000000000 --- a/JPSvisSettings.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE TraVisToProject SYSTEM "TraVisToProject.dtd"> -<TraVisToProject> - <visualisation_mode> - <mode>online</mode> - <server>localhost</server> - <port>14009</port> - </visualisation_mode> - <files> - <trajectories> - e:/workspace/TraVisTo/data/evacuationTime.dat - </trajectories> - <trajectories> - e:/workspace/TraVisTo/data/evacuationTime2.dat - </trajectories> - <geometry> - e:/workspace/TraVisTo/data/geometry.dat - </geometry> - </files> - <settings> - <mode>2D</mode> - <showAgent>true</showAgent> - <showGeometry>true</showGeometry> - <showLegend>true</showLegend> - <showCaption>true</showCaption> - <showAxis>true</showAxis> - <cameraView>top</cameraView> - <trails> - <type>polygones</type> - <points>100</points> - </trails> - - </settings> - -</TraVisToProject> diff --git a/src/Frame.cpp b/src/Frame.cpp index dddd5705d94b2cce6174682393e0e264a6c0a6cb..c62f6132c7d2215a119ad64de5e9710e168cd6d5 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -63,8 +63,8 @@ Frame::~Frame() } _framePoints.clear(); - _polydata2D->Delete(); - _polydata3D->Delete(); + //_polydata2D->Delete(); + //_polydata3D->Delete(); } int Frame::getSize() diff --git a/src/SaxParser.cpp b/src/SaxParser.cpp index 78eaeff4677990c201e2c2b39b65a4c5828530db..d5f2c5d10aa85ea5de2036814343342148b32a06 100644 --- a/src/SaxParser.cpp +++ b/src/SaxParser.cpp @@ -1040,7 +1040,6 @@ QString SaxParser::extractGeometryFilename(QString &filename) int endIndex = line.indexOf(end,startIndex); if(endIndex <= 0)continue; // false alarm extracted_geo_name= line.mid(startIndex,endIndex - startIndex); - cout<<"geoName:"<<extracted_geo_name.toStdString()<<endl; return extracted_geo_name; //break;// we are done } diff --git a/src/ThreadVisualisation.cpp b/src/ThreadVisualisation.cpp index f40ea417f1969004d776ec1d5fa8a8e9b8f743bf..7f7753a197e19d971ff28e6f027ee91cb9aac1c3 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"); @@ -157,10 +157,9 @@ void ThreadVisualisation::run(){ //initialize the datasets //mem leak - extern_glyphs_pedestrians = vtkTensorGlyph::New(); - extern_glyphs_pedestrians_3D = vtkTensorGlyph::New(); - initGlyphs2D(); + + initGlyphs2D(); initGlyphs3D(); //create the trails @@ -296,11 +295,11 @@ void ThreadVisualisation::run(){ } -// if(true || SystemSettings::get2D()){ -// renderer->GetActiveCamera()->OrthogonalizeViewUp(); -// renderer->GetActiveCamera()->ParallelProjectionOn(); -// renderer->ResetCamera(); -// } + if(true || SystemSettings::get2D()){ + renderer->GetActiveCamera()->OrthogonalizeViewUp(); + renderer->GetActiveCamera()->ParallelProjectionOn(); + renderer->ResetCamera(); + } //create a timer for rendering the window TimerCallback *renderingTimer = new TimerCallback(); @@ -427,6 +426,8 @@ void ThreadVisualisation::showFloor(bool status) void ThreadVisualisation::initGlyphs2D() { + extern_glyphs_pedestrians = vtkTensorGlyph::New(); + //glyphs with ellipsoids // VTK_CREATE (vtkSphereSource, agentShape); // agentShape->SetRadius(30); @@ -499,6 +500,9 @@ void ThreadVisualisation::initGlyphs2D() void ThreadVisualisation::initGlyphs3D() { + + extern_glyphs_pedestrians_3D = vtkTensorGlyph::New(); + //now create the glyphs with zylinders VTK_CREATE (vtkCylinderSource, agentShape); agentShape->SetHeight(160); diff --git a/src/geometry/PointPlotter.cpp b/src/geometry/PointPlotter.cpp index e36aa27155cef4a0ce36bb64a5e24834e0b0e376..d4c8c7b04f58c7dc8ddbff010ae2f058a2ae7c51 100644 --- a/src/geometry/PointPlotter.cpp +++ b/src/geometry/PointPlotter.cpp @@ -73,6 +73,7 @@ PointPlotter::PointPlotter() mapper->SetInputConnection(glyph->GetOutputPort()); //borrow the lookup table from the peds glyphs + if(extern_glyphs_pedestrians_actor_2D->GetMapper()) mapper->SetLookupTable( extern_glyphs_pedestrians_actor_2D->GetMapper()->GetLookupTable());