diff --git a/object_script.TraVisTo.Debug b/object_script.TraVisTo.Debug
deleted file mode 100644
index 8ebeb9e4277eddb0cdd6f56be074ce386529ef55..0000000000000000000000000000000000000000
--- a/object_script.TraVisTo.Debug
+++ /dev/null
@@ -1,46 +0,0 @@
-INPUT(
-./debug\Settings.o
-./debug\SaxParser.o
-./debug\Debug.o
-./debug\main.o
-./debug\travisto.o
-./debug\Frame.o
-./debug\InteractorStyle.o
-./debug\Pedestrian.o
-./debug\SimpleVisualisationWindow.o
-./debug\SyncData.o
-./debug\SystemSettings.o
-./debug\ThreadDataTransfert.o
-./debug\ThreadVisualisation.o
-./debug\TimerCallback.o
-./debug\TrajectoryPoint.o
-./debug\LinePlotter2D.o
-./debug\PointPlotter2D.o
-./debug\FacilityGeometry.o
-./debug\LinePlotter.o
-./debug\Point.o
-./debug\PointPlotter.o
-./debug\Building.o
-./debug\Room.o
-./debug\Line.o
-./debug\Transition.o
-./debug\Wall.o
-./debug\CPoint.o
-./debug\CLine.o
-./debug\CBuilding.o
-./debug\CRoom.o
-./debug\CCell.o
-./debug\CCoordsList.o
-./debug\Common.o
-./debug\CTextLog.o
-./debug\CTransition.o
-./debug\TraVisToServer.o
-./debug\moc_Settings.o
-./debug\moc_travisto.o
-./debug\moc_SyncData.o
-./debug\moc_ThreadDataTransfert.o
-./debug\moc_ThreadVisualisation.o
-./debug\moc_TimerCallback.o
-./debug\moc_TraVisToServer.o
-./debug\qrc_icons.o
-);
diff --git a/object_script.TraVisTo.Release b/object_script.TraVisTo.Release
deleted file mode 100644
index e5593b7344cace882d790cca938d4d7c2f44362b..0000000000000000000000000000000000000000
--- a/object_script.TraVisTo.Release
+++ /dev/null
@@ -1,46 +0,0 @@
-INPUT(
-./release\Settings.o
-./release\SaxParser.o
-./release\Debug.o
-./release\main.o
-./release\travisto.o
-./release\Frame.o
-./release\InteractorStyle.o
-./release\Pedestrian.o
-./release\SimpleVisualisationWindow.o
-./release\SyncData.o
-./release\SystemSettings.o
-./release\ThreadDataTransfert.o
-./release\ThreadVisualisation.o
-./release\TimerCallback.o
-./release\TrajectoryPoint.o
-./release\LinePlotter2D.o
-./release\PointPlotter2D.o
-./release\FacilityGeometry.o
-./release\LinePlotter.o
-./release\Point.o
-./release\PointPlotter.o
-./release\Building.o
-./release\Room.o
-./release\Line.o
-./release\Transition.o
-./release\Wall.o
-./release\CPoint.o
-./release\CLine.o
-./release\CBuilding.o
-./release\CRoom.o
-./release\CCell.o
-./release\CCoordsList.o
-./release\Common.o
-./release\CTextLog.o
-./release\CTransition.o
-./release\TraVisToServer.o
-./release\moc_Settings.o
-./release\moc_travisto.o
-./release\moc_SyncData.o
-./release\moc_ThreadDataTransfert.o
-./release\moc_ThreadVisualisation.o
-./release\moc_TimerCallback.o
-./release\moc_TraVisToServer.o
-./release\qrc_icons.o
-);
diff --git a/src/SaxParser.cpp b/src/SaxParser.cpp
index fbaf4c28efec9b4987c14f27f4886bd4eea52d05..6150593f4d5d5dcfd9674be62700bc66f71618ef 100644
--- a/src/SaxParser.cpp
+++ b/src/SaxParser.cpp
@@ -42,6 +42,7 @@
#include <QString>
#include <limits>
#include <iostream>
+#include <cmath>
using namespace std;
@@ -60,6 +61,7 @@ SaxParser::SaxParser(FacilityGeometry* geo, SyncData* data, double* fps){
dataset=data;
para=fps;
parsingWalls=false;
+ color=0.0;
dataset->clearFrames();
}
diff --git a/src/SaxParser.h b/src/SaxParser.h
index be322fe3a0d3bb7ac34e3b645fb6a80e08892fc8..85b494cfbc559d71a9be702688f4a846caca1a9f 100644
--- a/src/SaxParser.h
+++ b/src/SaxParser.h
@@ -32,6 +32,7 @@
#include <QtXml>
#include <QTreeWidget>
+#include <vector>
#include "SyncData.h"
diff --git a/src/ThreadVisualisation.cpp b/src/ThreadVisualisation.cpp
index 4b7885261a609a28319adfbd80c35358896b701c..95318e448d08bf117e55b01ee2020e1f273fcddb 100644
--- a/src/ThreadVisualisation.cpp
+++ b/src/ThreadVisualisation.cpp
@@ -196,20 +196,19 @@ void ThreadVisualisation::run(){
// Create a real circle, not a sphere
{
- VTK_CREATE(vtkRegularPolygonSource, polygonSource);
- polygonSource->GeneratePolygonOff();
- polygonSource->SetNumberOfSides(50);
- polygonSource->SetRadius(700);
- polygonSource->SetCenter(0,0,0);
- polygonSource->Update();
-
- VTK_CREATE(vtkPolyDataMapper,mapper);
- mapper->SetInputConnection(polygonSource->GetOutputPort());
- VTK_CREATE(vtkActor,actor);
- actor->GetProperty()->SetColor(180.0/255,180.0/255.0,180.0/255.0);
- actor->SetMapper(mapper);
-
- //renderer->AddActor(actor);
+// VTK_CREATE(vtkRegularPolygonSource, polygonSource);
+// polygonSource->GeneratePolygonOff();
+// polygonSource->SetNumberOfSides(50);
+// polygonSource->SetRadius(700);
+// polygonSource->SetCenter(0,0,0);
+// polygonSource->Update();
+//
+// VTK_CREATE(vtkPolyDataMapper,mapper);
+// mapper->SetInputConnection(polygonSource->GetOutputPort());
+// VTK_CREATE(vtkActor,actor);
+// actor->GetProperty()->SetColor(180.0/255,180.0/255.0,180.0/255.0);
+// actor->SetMapper(mapper);
+// renderer->AddActor(actor);
}
diff --git a/src/TimerCallback.cpp b/src/TimerCallback.cpp
index 18e358b435e938973226b30efa7ad21cb33a0c09..0ce3bd376c52527053b456c40fd28cd80623662c 100644
--- a/src/TimerCallback.cpp
+++ b/src/TimerCallback.cpp
@@ -595,7 +595,8 @@ void TimerCallback::takeScreenshotSequence(vtkRenderWindow* renderWindow){
QString screenshots;
SystemSettings::getOutputDirectory(screenshots);
- screenshots.append("./png_seq_"+QDateTime::currentDateTime().toString("yyMMdd_hh_mm")+"_"+SystemSettings::getFilenamePrefix());
+ screenshots.append("./png_seq_"+QDateTime::currentDateTime().toString("yyMMddhh")+"_"+SystemSettings::getFilenamePrefix());
+ screenshots.truncate(screenshots.size()-1);
//create directory if not exits
if(!QDir(screenshots).exists()){
@@ -603,13 +604,14 @@ void TimerCallback::takeScreenshotSequence(vtkRenderWindow* renderWindow){
if(!dir.mkpath (screenshots )){
cerr<<"could not create directory: "<< screenshots.toStdString();
//try with the current directory
- screenshots="./png_seq_"+QDateTime::currentDateTime().toString("yyMMdd_hh_mm")+"_"+SystemSettings::getFilenamePrefix();
+ screenshots="./png_seq_"+QDateTime::currentDateTime().toString("yyMMdd")+"_"+SystemSettings::getFilenamePrefix();
+ screenshots.truncate(screenshots.size()-1);
}
}
char filename[30]={0};
- sprintf(filename,"/tmp_%d.png",imageID++);
+ sprintf(filename,"/tmp_%07d.png",imageID++);
screenshots.append(filename);
image->SetFileName(screenshots.toStdString().c_str());
winToImFilter->Modified();
diff --git a/src/geometry/FacilityGeometry.cpp b/src/geometry/FacilityGeometry.cpp
index 046ef943c5a124a780deac6055bbbaf995dd405c..118dbc6e2ab1e22b2b1c2284a622bf51d6168b8b 100644
--- a/src/geometry/FacilityGeometry.cpp
+++ b/src/geometry/FacilityGeometry.cpp
@@ -581,8 +581,8 @@ void FacilityGeometry::addNewElementText(double center[3], double orientation[3]
// set the properties of the caption
//FARBE
vtkTextProperty* tprop = caption->GetTextProperty();
- tprop->SetFontFamilyToArial();
- tprop->BoldOn();
+ //tprop->SetFontFamilyToArial();
+ //tprop->BoldOn();
//tprop->ShadowOn();
//tprop->SetLineSpacing(1.0);
tprop->SetFontSize(SystemSettings::getPedestrianCaptionSize());
@@ -590,6 +590,8 @@ void FacilityGeometry::addNewElementText(double center[3], double orientation[3]
double colorRGB[3];
lookupTable->GetColor(color, colorRGB);
tprop->SetColor(colorRGB);
+
+ //cout<<"size:" <<tprop->GetFontSize()<<endl;
//tprop->SetColor(1,0,0);
caption->SetPosition(center);