From 410e2fad558a3170baa0c70a53c8198ba624fc0f Mon Sep 17 00:00:00 2001
From: Ulrich Kemloh <kemlohulrich@gmail.com>
Date: Thu, 24 Jul 2014 10:22:46 +0200
Subject: [PATCH] fixed compilation issues on linux. Decimals were handled with
comma instead of period
---
src/MainWindow.cpp | 6 +++---
src/ThreadVisualisation.cpp | 4 ++++
src/TrailPlotter.cpp | 2 +-
src/geometry/Building.cpp | 2 +-
src/main.cpp | 3 ++-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index f417d59..3630a0e 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 de8e8d0..7e34d36 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 a905300..9c7b1e8 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 54bf5a3..b8e7a84 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 035b704..5cb9a4d 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();
--
GitLab