diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index b550370..0882de2 100644 Binary files a/of/Active Tripod/bin/Active_Tripod.lib and b/of/Active Tripod/bin/Active_Tripod.lib differ diff --git a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml index 8b92a28..90d4365 100644 --- a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml +++ b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml @@ -6,12 +6,12 @@ 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(