From 78c8e50351449c452311a04f776d166d697f7326 Mon Sep 17 00:00:00 2001 From: James Alliban Date: Fri, 24 Jan 2014 14:51:36 +0000 Subject: [PATCH] HUD info displayed correctly --- of/Active Tripod/bin/Active_Tripod.lib | Bin 78700 -> 78700 bytes of/Active Tripod/src/visual/Scene.cpp | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index b97ca0d52cd99dd5e1aff5911528dbabbfe8c934..5fbc4bbcdabbfbe14f3db4216b0a907a739ee69e 100644 GIT binary patch delta 6729 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 delta 6729 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 diff --git a/of/Active Tripod/src/visual/Scene.cpp b/of/Active Tripod/src/visual/Scene.cpp index 51a198b..05f4581 100644 --- a/of/Active Tripod/src/visual/Scene.cpp +++ b/of/Active Tripod/src/visual/Scene.cpp @@ -319,8 +319,8 @@ void Scene::addNewData(vector newData) bodyGraph.addNewData(newData); separateBodyGraph.addNewData(newData); - tlStr = newData[0].info + newData[0].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[0].stringValue), valDecimalPoints0); - trStr = newData[1].info + newData[1].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[1].stringValue), valDecimalPoints1); + tlStr = newData[0].info + "\n" + newData[0].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[0].stringValue), valDecimalPoints0); + trStr = newData[1].info + "\n" + newData[1].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[1].stringValue), valDecimalPoints1); }