gauthiier/CRITICAL-INFRASTRUCTURE
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Decimal point amount individually configurable

Browse Source
This commit is contained in:
James Alliban
2014-01-24 14:48:57 +00:00
parent 8c4e4236bc
commit 6bd2d52c2d
6 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
of/Active Tripod/bin/Active_Tripod.lib
BIN
View File
Binary file not shown.
of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml
+7 -2
View File
@@ -31,8 +31,13 @@
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Decimal points (All)</Name>
<Value>2.924342155</Value>
<Name>Decimal points 0</Name>
<Value>5.174342155</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Decimal points 1</Name>
<Value>2.332236767</Value>
</Widget>
<Widget>
<Kind>4</Kind>
of/Active Tripod/bin/data/GUI/SEPARATE BODY GRAPH DESIGNguiPagesettings.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<Widget>
<Kind>4</Kind>
<Name>Data send speed (seconds)</Name>
<Value>4.682236671</Value>
<Value>0.950986862</Value>
</Widget>
<Widget>
<Kind>4</Kind>
of/Active Tripod/src/gui/GUI.cpp
+2 -1
View File
@@ -75,7 +75,8 @@ void GUI::addGraphGlobalGUI()
gui->addLabel("GRAPH TEXT");
gui->addSpacer(length, 1);
gui->addSlider("Size", 5, 50, &app->scene.graphTextSize, length, dim);
gui->addSlider("Decimal points (All)", 1, 10, &app->scene.valDecimalPoints, length, dim);
gui->addSlider("Decimal points 0", 1, 10, &app->scene.valDecimalPoints0, length, dim);
gui->addSlider("Decimal points 1", 1, 10, &app->scene.valDecimalPoints1, length, dim);
gui->addSlider("Red", 0, 255, &app->scene.graphTextColour[0], length, dim);
gui->addSlider("Green", 0, 255, &app->scene.graphTextColour[1], length, dim);
gui->addSlider("Blue", 0, 255, &app->scene.graphTextColour[2], length, dim);
of/Active Tripod/src/visual/Scene.cpp
+10 -10
View File
@@ -86,8 +86,8 @@ void Scene::drawGraphValues()
val1 = activeGraph->graphTextPnt1;
}
string stringVal0 = reduceDecimalCount(activeGraph->publisher0Data.back().stringValue, valDecimalPoints);
string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, valDecimalPoints);
string stringVal0 = reduceDecimalCount(activeGraph->publisher0Data.back().stringValue, valDecimalPoints0);
string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, valDecimalPoints1);
ofPushStyle();
text.setAlignment(FTGL_ALIGN_LEFT);
@@ -171,8 +171,8 @@ void Scene::drawHUDCopy()
if (activeGraph->publisher0Data.size() == 0) return;
string stringVal0 = reduceDecimalCount(activeGraph->publisher0Data.back().stringValue, valDecimalPoints);
string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, valDecimalPoints);
string stringVal0 = reduceDecimalCount(activeGraph->publisher0Data.back().stringValue, valDecimalPoints0);
string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, valDecimalPoints1);
int amountToAverage = MIN(p0Data->size(), averageAmount);
@@ -189,7 +189,7 @@ void Scene::drawHUDCopy()
blStr = "Increase: " + ofToString(p0Data->back().value - p0Data->at(p0Data->size() - 2).value) + "\n" +
"Current Value: " + stringVal0 + "\n" +
"Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints);
"Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints0);
drawTextBox(blStr, "BOTTOM LEFT");
}
else
@@ -203,7 +203,7 @@ void Scene::drawHUDCopy()
blStr = "Increase: " + ofToString(p0Data->back().value - p0Data->at(p0Data->size() - 2).value) + "\n" +
"Current Value: " + stringVal0 + "\n" +
"Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints);
"Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints0);
drawTextBox(blStr, "BOTTOM LEFT");
}
@@ -219,7 +219,7 @@ void Scene::drawHUDCopy()
brStr = "Increase: " + ofToString(p1Data->back().value - p1Data->at(p1Data->size() - 2).value) + "\n" +
"Current Value: " + stringVal1 + "\n" +
"Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints);
"Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints1);
drawTextBox(brStr, "BOTTOM RIGHT");
}
else
@@ -233,7 +233,7 @@ void Scene::drawHUDCopy()
brStr = "Increase: " + ofToString(p1Data->back().value - p1Data->at(p1Data->size() - 2).value) + "\n" +
"Current Value: " + stringVal1 + "\n" +
"Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints);
"Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints1);
drawTextBox(brStr, "BOTTOM RIGHT");
}
}
@@ -319,8 +319,8 @@ void Scene::addNewData(vector<DataObject> newData)
bodyGraph.addNewData(newData);
separateBodyGraph.addNewData(newData);
tlStr = newData[0].info + newData[0].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[0].stringValue), valDecimalPoints);
trStr = newData[1].info + newData[1].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[1].stringValue), valDecimalPoints);
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);
}
of/Active Tripod/src/visual/Scene.h
+3 -2
View File
@@ -93,6 +93,7 @@ public:
float topColourBoxXOffset;
float bottomColourBoxXOffset;
float colourBoxThickness;
float valDecimalPoints;
float valDecimalPoints0;
float valDecimalPoints1;
};