diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib
index 84da758..315d99f 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/BAR GRAPH DESIGNguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/BAR GRAPH DESIGNguiPagesettings.xml
index 1380609..52a5d36 100644
--- a/of/Active Tripod/bin/data/GUI/BAR GRAPH DESIGNguiPagesettings.xml
+++ b/of/Active Tripod/bin/data/GUI/BAR GRAPH DESIGNguiPagesettings.xml
@@ -11,7 +11,7 @@
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);