From 5334e47edf1396d031683042e3a059fb4f83c591 Mon Sep 17 00:00:00 2001 From: James Alliban Date: Sat, 25 Jan 2014 21:26:08 +0000 Subject: [PATCH] Couple of bug fixes Info text now shows correct copy Graphs now ascend and descend correctly --- of/Active Tripod/bin/Active_Tripod.lib | Bin 78700 -> 78700 bytes .../data/GUI/GRAPH GLOBALguiPagesettings.xml | 4 +-- of/Active Tripod/src/visual/Scene.cpp | 2 +- .../src/visual/graph/BodyGraph.cpp | 24 +++++++++--------- .../src/visual/graph/SeparateBodyGraph.cpp | 14 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index b550370569e25ca5ad96414f93938f89435763c4..0882de2e38e6526f14cc35b098ad4e6e7d4968f4 100644 GIT binary patch delta 7553 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 2 Solid Body graph - 0 + 1 2 Separate Body graph - 1 + 0 2 diff --git a/of/Active Tripod/src/visual/Scene.cpp b/of/Active Tripod/src/visual/Scene.cpp index 5659ff4..16d6797 100644 --- a/of/Active Tripod/src/visual/Scene.cpp +++ b/of/Active Tripod/src/visual/Scene.cpp @@ -228,7 +228,7 @@ void Scene::drawHUDCopy() } tlStr = p0Data->back().info + "\n" + p0Data->back().unitMeasure + "\n" + stringVal0; - trStr = p0Data->back().info + "\n" + p0Data->back().unitMeasure + "\n" + stringVal1; + trStr = p1Data->back().info + "\n" + p1Data->back().unitMeasure + "\n" + stringVal1; text.setLineLength(lineLength); text.setLineSpacing(lineSpacing); diff --git a/of/Active Tripod/src/visual/graph/BodyGraph.cpp b/of/Active Tripod/src/visual/graph/BodyGraph.cpp index b0c1dc5..384e0a1 100644 --- a/of/Active Tripod/src/visual/graph/BodyGraph.cpp +++ b/of/Active Tripod/src/visual/graph/BodyGraph.cpp @@ -49,21 +49,21 @@ void BodyGraph::draw() { body.addVertex(ofVec3f( i * graphItemXGap + xOffset, - ofMap(publisher0Data[i].value, publisher0Data[i].min, publisher0Data[i].max, outputMin, outputMax), + ofMap(publisher0Data[i].value, publisher0Data[i].max, publisher0Data[i].min, outputMin, outputMax), 0)); body.addVertex(ofVec3f( i * graphItemXGap + xOffset, - ofMap(publisher1Data[i].value, publisher1Data[i].min, publisher1Data[i].max, outputMin, outputMax), + ofMap(publisher1Data[i].value, publisher1Data[i].max, publisher1Data[i].min, outputMin, outputMax), 0)); } else { - float targetY0 = ofMap(publisher0Data[i].value, publisher0Data[i].min, publisher0Data[i].max, outputMin, outputMax); - float prevY0 = ofMap(publisher0Data[i-1].value, publisher0Data[i-1].min, publisher0Data[i-1].max, outputMin, outputMax); + float targetY0 = ofMap(publisher0Data[i].value, publisher0Data[i].max, publisher0Data[i].min, outputMin, outputMax); + float prevY0 = ofMap(publisher0Data[i-1].value, publisher0Data[i-1].max, publisher0Data[i-1].min, outputMin, outputMax); endPoint0.y = ofMap(normalisedTimeInc, 0, 1, prevY0, targetY0); - float targetY1 = ofMap(publisher1Data[i].value, publisher1Data[i].min, publisher1Data[i].max, outputMin, outputMax); - float prevY1 = ofMap(publisher1Data[i-1].value, publisher1Data[i-1].min, publisher1Data[i-1].max, outputMin, outputMax); + float targetY1 = ofMap(publisher1Data[i].value, publisher1Data[i].max, publisher1Data[i].min, outputMin, outputMax); + float prevY1 = ofMap(publisher1Data[i-1].value, publisher1Data[i-1].max, publisher1Data[i-1].min, outputMin, outputMax); endPoint1.y = ofMap(normalisedTimeInc, 0, 1, prevY1, targetY1); endPoint0.x = (i-1) * graphItemXGap + xOffset + (graphItemXGap * normalisedTimeInc); @@ -81,11 +81,11 @@ void BodyGraph::draw() //float mahousive = 1000000000; //animatedVal0 = ofMap(endPoint0.y * mahousive, outputMin * mahousive, outputMax * mahousive, publisher0Data.back().min * mahousive, publisher0Data.back().max * mahousive); //animatedVal0LLI = ofMap(endPoint0.y * mahousive, outputMin * mahousive, outputMax * mahousive, publisher0Data.back().min * mahousive, publisher0Data.back().max * mahousive); - animatedVal0 = ofMap(endPoint0.y, outputMin, outputMax, publisher0Data.back().min, publisher0Data.back().max); - animatedVal0LLI = ofMap(endPoint0.y, outputMin, outputMax, publisher0Data.back().min, publisher0Data.back().max); + animatedVal0 = ofMap(endPoint0.y, outputMax, outputMin, publisher0Data.back().min, publisher0Data.back().max); + animatedVal0LLI = ofMap(endPoint0.y, outputMax, outputMin, publisher0Data.back().min, publisher0Data.back().max); - animatedVal1 = ofMap(endPoint1.y, outputMin, outputMax, publisher1Data.back().min, publisher1Data.back().max); - animatedVal1LLI = ofMap(endPoint1.y, outputMin, outputMax, publisher1Data.back().min, publisher1Data.back().max); + animatedVal1 = ofMap(endPoint1.y, outputMax, outputMin, publisher1Data.back().min, publisher1Data.back().max); + animatedVal1LLI = ofMap(endPoint1.y, outputMax, outputMin, publisher1Data.back().min, publisher1Data.back().max); } body.addColor(ofColor(col0[0],col0[1],col0[2], col0[3])); @@ -128,12 +128,12 @@ void BodyGraph::draw() { poly0.addVertex(ofPoint( i * graphItemXGap + xOffset, - ofMap(publisher0Data[i].value, publisher0Data[i].min, publisher0Data[i].max, outputMin, outputMax))); + ofMap(publisher0Data[i].value, publisher0Data[i].max, publisher0Data[i].min, outputMin, outputMax))); poly1.addVertex(ofPoint( i * graphItemXGap + xOffset, - ofMap(publisher1Data[i].value, publisher1Data[i].min, publisher1Data[i].max, outputMin, outputMax))); + ofMap(publisher1Data[i].value, publisher1Data[i].max, publisher1Data[i].min, outputMin, outputMax))); } else { diff --git a/of/Active Tripod/src/visual/graph/SeparateBodyGraph.cpp b/of/Active Tripod/src/visual/graph/SeparateBodyGraph.cpp index 55fd7c4..e592e76 100644 --- a/of/Active Tripod/src/visual/graph/SeparateBodyGraph.cpp +++ b/of/Active Tripod/src/visual/graph/SeparateBodyGraph.cpp @@ -130,7 +130,7 @@ ofMesh SeparateBodyGraph::getMesh(vector publisherData, float* col, { bodyMesh.addVertex(ofVec3f( i * graphItemXGap + xOffset, - ofMap(publisherData[i].value, publisherData[i].min, publisherData[i].max, outputMin, outputMax), + ofMap(publisherData[i].value, publisherData[i].max, publisherData[i].min, outputMin, outputMax), 0)); bodyMesh.addVertex(ofVec3f( i * graphItemXGap + xOffset, @@ -139,22 +139,22 @@ ofMesh SeparateBodyGraph::getMesh(vector publisherData, float* col, } else { - float targetY0 = ofMap(publisherData[i].value, publisherData[i].min, publisherData[i].max, outputMin, outputMax); - float prevY0 = ofMap(publisherData[i-1].value, publisherData[i-1].min, publisherData[i-1].max, outputMin, outputMax); + float targetY0 = ofMap(publisherData[i].value, publisherData[i].max, publisherData[i].min, outputMin, outputMax); + float prevY0 = ofMap(publisherData[i-1].value, publisherData[i-1].max, publisherData[i-1].min, outputMin, outputMax); endPoint0.y = ofMap(normalisedTimeInc, 0, 1, prevY0, targetY0); endPoint0.x = (i-1) * graphItemXGap + xOffset + (graphItemXGap * normalisedTimeInc); if (graphID == 0) { - animatedVal0 = ofMap(endPoint0.y, outputMin, outputMax, publisher0Data.back().min, publisher0Data.back().max); - animatedVal0LLI = ofMap(endPoint0.y, outputMin, outputMax, publisher0Data.back().min, publisher0Data.back().max); + animatedVal0 = ofMap(endPoint0.y, outputMax, outputMin, publisher0Data.back().min, publisher0Data.back().max); + animatedVal0LLI = ofMap(endPoint0.y, outputMax, outputMin, publisher0Data.back().min, publisher0Data.back().max); //animatedVal0 = 99111222333; //animatedVal0LLI = 99111222333; } else { - animatedVal1 = ofMap(endPoint0.y, outputMin, outputMax, publisher1Data.back().min, publisher1Data.back().max); - animatedVal1LLI = ofMap(endPoint0.y, outputMin, outputMax, publisher1Data.back().min, publisher1Data.back().max); + animatedVal1 = ofMap(endPoint0.y, outputMax, outputMin, publisher1Data.back().min, publisher1Data.back().max); + animatedVal1LLI = ofMap(endPoint0.y, outputMax, outputMin, publisher1Data.back().min, publisher1Data.back().max); } bodyMesh.addVertex(ofVec3f(