diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index f417d596eb8cefd7a9e2aa591278c126b774291d..3630a0ebea41defbd5ffcacd33235340099ae3cf 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -522,8 +522,6 @@ bool MainWindow::slotAddDataSet(){ return false; } - slotStartPlaying(); - QString stre(numberOfDatasetLoaded); stre.setNum(numberOfDatasetLoaded); stre.append(" dataset loaded"); @@ -591,7 +589,9 @@ bool MainWindow::addPedestrianGroup(int groupID,QString fileName) SyncData* dataset=NULL; - + extern_trajectories_firstSet.clearFrames(); + extern_trajectories_secondSet.clearFrames(); + extern_trajectories_thirdSet.clearFrames(); switch(groupID){ case 1: diff --git a/src/ThreadVisualisation.cpp b/src/ThreadVisualisation.cpp index de8e8d0aec16c3b39d844694741735c83c370eba..7e34d36c9528f980d185975784b580729cffe430 100644 --- a/src/ThreadVisualisation.cpp +++ b/src/ThreadVisualisation.cpp @@ -156,6 +156,10 @@ void ThreadVisualisation::run(){ renderer->AddActor(geometry->getActor3D()); //initialize the datasets + //mem leak + extern_glyphs_pedestrians = vtkTensorGlyph::New(); + extern_glyphs_pedestrians_3D = vtkTensorGlyph::New(); + initGlyphs2D(); initGlyphs3D(); diff --git a/src/TrailPlotter.cpp b/src/TrailPlotter.cpp index a905300a71457df31bf51fd9cdb8be6504a8a837..9c7b1e85a6e4df60f17f2186d031a1f994c9cfcc 100644 --- a/src/TrailPlotter.cpp +++ b/src/TrailPlotter.cpp @@ -1,6 +1,6 @@ #include "TrailPlotter.h" -#include <VTKActor.h> +#include <vtkActor.h> #include <vtkPolyData.h> #include <vtkSmartPointer.h> #include <vtkCleanPolyData.h> diff --git a/src/geometry/Building.cpp b/src/geometry/Building.cpp index 54bf5a32c1c0f9ab31405d18d70fdb82cf3e3fae..b8e7a8476021379edd16e5adceb01fed7ec1b604 100644 --- a/src/geometry/Building.cpp +++ b/src/geometry/Building.cpp @@ -344,7 +344,7 @@ void Building::LoadBuildingFromFile(const std::string &filename) { double version = xmltof(xRootNode->Attribute("version"), -1); if (version < 0.4) { - Log->Write("ERROR: \tOnly version > 0.4 supported"); + Log->Write("ERROR: \tOnly version > 0.4 supported. Your version is %f",version); Log->Write("ERROR: \tparsing geometry file failed!"); exit(EXIT_FAILURE); } diff --git a/src/main.cpp b/src/main.cpp index 035b704f97107ad5572a422f0071500113e217de..5cb9a4dc85a2b8dc4b3b6803dea0e24d8e30824b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -61,7 +61,8 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); // To ensure that decimal numbers use a "point" instead of "colon" on some systems - setlocale(LC_NUMERIC, "en_US" ); + //setlocale(LC_NUMERIC, "en_US" ); + setlocale(LC_NUMERIC,"C"); MainWindow w; w.show();