From ec0b69726c65bfe5bb2fc33d37d10bf594a1e78c Mon Sep 17 00:00:00 2001 From: James Alliban Date: Sat, 11 Jan 2014 20:00:46 +0000 Subject: [PATCH] Graph height now percent rather than pixels --- of/Active Tripod/bin/Active_Tripod.lib | Bin 78700 -> 78700 bytes .../GUI/BAR GRAPH DESIGNguiPagesettings.xml | 2 +- .../GUI/BODY GRAPH DESIGNguiPagesettings.xml | 2 +- ...ARATE BODY GRAPH DESIGNguiPagesettings.xml | 2 +- of/Active Tripod/src/gui/GUI.cpp | 6 ++--- .../src/visual/graph/BarGraph.cpp | 4 +-- .../src/visual/graph/BodyGraph.cpp | 15 ++---------- .../src/visual/graph/SeparateBodyGraph.cpp | 23 +++--------------- 8 files changed, 14 insertions(+), 40 deletions(-) diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index 84da7584136da718faa53321b08661a5edb3cf77..315d99f7e2b2b3574ff1ddab50fbb93c2b19ddba 100644 GIT binary patch delta 7034 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 e>r1Qu|BWSDC 4 Graph Height Max - 440.460510254 + 0.569078922 4 diff --git a/of/Active Tripod/bin/data/GUI/BODY GRAPH DESIGNguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/BODY GRAPH DESIGNguiPagesettings.xml index d575b63..bceafd1 100644 --- a/of/Active Tripod/bin/data/GUI/BODY GRAPH DESIGNguiPagesettings.xml +++ b/of/Active Tripod/bin/data/GUI/BODY GRAPH DESIGNguiPagesettings.xml @@ -21,7 +21,7 @@ 4 Graph Height Max - 443.421051025 + 0.417763144 4 diff --git a/of/Active Tripod/bin/data/GUI/SEPARATE BODY GRAPH DESIGNguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/SEPARATE BODY GRAPH DESIGNguiPagesettings.xml index 7b88529..d5f21c3 100644 --- a/of/Active Tripod/bin/data/GUI/SEPARATE BODY GRAPH DESIGNguiPagesettings.xml +++ b/of/Active Tripod/bin/data/GUI/SEPARATE BODY GRAPH DESIGNguiPagesettings.xml @@ -16,7 +16,7 @@ 4 Graph Height Max - 325.000000000 + 0.470394731 4 diff --git a/of/Active Tripod/src/gui/GUI.cpp b/of/Active Tripod/src/gui/GUI.cpp index 7840194..ad04e7c 100644 --- a/of/Active Tripod/src/gui/GUI.cpp +++ b/of/Active Tripod/src/gui/GUI.cpp @@ -81,7 +81,7 @@ void GUI::addBarGraphDesignGUI() gui->addSlider("Graph Item X Gap", 5, 50, &app->scene.barGraph.graphItemXGap, length, dim); gui->addSlider("BarWidth", 2, 50, &app->scene.barGraph.barWidth, length, dim); - gui->addSlider("Graph Height Max", 100, 1000, &app->scene.barGraph.graphHeightMax, length, dim); + gui->addSlider("Graph Height Max", 0, 1, &app->scene.barGraph.graphHeightMax, length, dim); gui->addSlider("Data send speed (seconds)", 0.1, 20, &app->scene.barGraph.sendDataSpeed, length, dim); gui->addSpacer(length, 1); @@ -109,7 +109,7 @@ void GUI::addBodyGraphDesignGUI() gui->addToggle("Toggle Draw Lines", &app->scene.bodyGraph.isDrawLines, toggleDim, toggleDim); gui->addSlider("Graph Item X Gap", 5, 50, &app->scene.bodyGraph.graphItemXGap, length, dim); gui->addSlider("Line width", 1, 50, &app->scene.bodyGraph.lineWidth, length, dim); - gui->addSlider("Graph Height Max", 100, 1000, &app->scene.bodyGraph.graphHeightMax, length, dim); + gui->addSlider("Graph Height Max", 0, 1, &app->scene.bodyGraph.graphHeightMax, length, dim); gui->addSlider("Data send speed (seconds)", 0.1, 20, &app->scene.bodyGraph.sendDataSpeed, length, dim); gui->addSpacer(length, 1); @@ -136,7 +136,7 @@ void GUI::addSeparateBodyGraphDesignGUI() gui->addToggle("Toggle Draw Lines", &app->scene.separateBodyGraph.isDrawLines, toggleDim, toggleDim); gui->addSlider("Graph Item X Gap", 5, 50, &app->scene.separateBodyGraph.graphItemXGap, length, dim); gui->addSlider("Line width", 1, 50, &app->scene.separateBodyGraph.lineWidth, length, dim); - gui->addSlider("Graph Height Max", 100, 1000, &app->scene.separateBodyGraph.graphHeightMax, length, dim); + gui->addSlider("Graph Height Max", 0, 1, &app->scene.separateBodyGraph.graphHeightMax, length, dim); gui->addSlider("Graph bottom end (percent)", 0, 2, &app->scene.separateBodyGraph.graphEndPercent, length, dim); gui->addSlider("Data send speed (seconds)", 0.1, 20, &app->scene.separateBodyGraph.sendDataSpeed, length, dim); diff --git a/of/Active Tripod/src/visual/graph/BarGraph.cpp b/of/Active Tripod/src/visual/graph/BarGraph.cpp index d6506d2..3d87f48 100644 --- a/of/Active Tripod/src/visual/graph/BarGraph.cpp +++ b/of/Active Tripod/src/visual/graph/BarGraph.cpp @@ -51,8 +51,8 @@ void BarGraph::draw() } float xOffset = ofGetWidth() * AbstractGraph::minGraphPercent; - float outputMin = (ofGetHeight() * 0.5) - graphHeightMax; - float outputMax = (ofGetHeight() * 0.5) + graphHeightMax; + float outputMin = (ofGetHeight() * 0.5) - ((ofGetHeight() * 0.5) * graphHeightMax); + float outputMax = (ofGetHeight() * 0.5) + ((ofGetHeight() * 0.5) * graphHeightMax); for (int i = 0; i < publisher0Data.size() - 1; i++) { diff --git a/of/Active Tripod/src/visual/graph/BodyGraph.cpp b/of/Active Tripod/src/visual/graph/BodyGraph.cpp index 249bddb..f1b2dd5 100644 --- a/of/Active Tripod/src/visual/graph/BodyGraph.cpp +++ b/of/Active Tripod/src/visual/graph/BodyGraph.cpp @@ -32,20 +32,9 @@ void BodyGraph::draw() if (publisher0Data.size() > 1) { - //for (int i = 0; i < publisher0Data.size() - 1; i++) - //{ - // ofPushStyle(); - // ofSetColor(255, 0, 0); - // ofCircle(i * graphItemXGap, publisher0Data[i], 5); - // ofSetColor(0, 255, 0); - // ofCircle(i * graphItemXGap, publisher1Data[i], 5); - // ofPopStyle(); - //} - - float xOffset = ofGetWidth() * AbstractGraph::minGraphPercent; - float outputMin = (ofGetHeight() * 0.5) - graphHeightMax; - float outputMax = (ofGetHeight() * 0.5) + graphHeightMax; + float outputMin = (ofGetHeight() * 0.5) - ((ofGetHeight() * 0.5) * graphHeightMax); + float outputMax = (ofGetHeight() * 0.5) + ((ofGetHeight() * 0.5) * graphHeightMax); if (isDrawBody) { diff --git a/of/Active Tripod/src/visual/graph/SeparateBodyGraph.cpp b/of/Active Tripod/src/visual/graph/SeparateBodyGraph.cpp index fd72e02..13a04b8 100644 --- a/of/Active Tripod/src/visual/graph/SeparateBodyGraph.cpp +++ b/of/Active Tripod/src/visual/graph/SeparateBodyGraph.cpp @@ -31,27 +31,12 @@ void SeparateBodyGraph::draw() if (publisher0Data.size() > 1) { - //for (int i = 0; i < publisher0Data.size() - 1; i++) - //{ - // ofPushStyle(); - // ofSetColor(255, 0, 0); - // ofCircle(i * graphItemXGap, publisher0Data[i], 5); - // ofSetColor(0, 255, 0); - // ofCircle(i * graphItemXGap, publisher1Data[i], 5); - // ofPopStyle(); - //} - - - ofMesh body0 = getMesh(publisher0Data, col0); ofMesh body1 = getMesh(publisher1Data, col1); - - - float xOffset = ofGetWidth() * AbstractGraph::minGraphPercent; - float outputMin = (ofGetHeight() * 0.5) - graphHeightMax; - float outputMax = (ofGetHeight() * 0.5) + graphHeightMax; + float outputMin = (ofGetHeight() * 0.5) - ((ofGetHeight() * 0.5) * graphHeightMax); + float outputMax = (ofGetHeight() * 0.5) + ((ofGetHeight() * 0.5) * graphHeightMax); // draw lines @@ -141,8 +126,8 @@ ofMesh SeparateBodyGraph::getMesh(vector publisherData, float* col) { ofMesh bodyMesh; float xOffset = ofGetWidth() * AbstractGraph::minGraphPercent; - float outputMin = (ofGetHeight() * 0.5) - graphHeightMax; - float outputMax = (ofGetHeight() * 0.5) + graphHeightMax; + float outputMin = (ofGetHeight() * 0.5) - ((ofGetHeight() * 0.5) * graphHeightMax); + float outputMax = (ofGetHeight() * 0.5) + ((ofGetHeight() * 0.5) * graphHeightMax); // draw main part of graph (xOffset) bodyMesh.setMode(OF_PRIMITIVE_TRIANGLE_STRIP);