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

Decimal places are shortened to 4 in tripod

Browse Source 
Also fixed a bug that showed wrong average on bottom right hud copy
This commit is contained in:
James Alliban 2014-01-23 02:23:56 +00:00
parent c0a0d9b0a1
commit c1ab6b1d9b
3 changed files with 61 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
of/Active Tripod/bin/Active_Tripod.lib
View File

Binary file not shown.

81
of/Active Tripod/src/visual/Scene.cpp
View File

@ -77,16 +77,19 @@ void Scene::drawGraphValues()
ofPoint val0 = activeGraph->currentPub0Point; ofPoint val0 = activeGraph->currentPub0Point;
ofPoint val1 = activeGraph->currentPub1Point; ofPoint val1 = activeGraph->currentPub1Point;
string stringVal0 = reduceDecimalCount(activeGraph->publisher0Data.back().stringValue, 4);
string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, 4);
ofPushStyle(); ofPushStyle();
text.setAlignment(FTGL_ALIGN_LEFT); text.setAlignment(FTGL_ALIGN_LEFT);
ofSetColor(graphTextColour[0], graphTextColour[1], graphTextColour[2], graphTextColour[3]); ofSetColor(graphTextColour[0], graphTextColour[1], graphTextColour[2], graphTextColour[3]);
text.setSize(graphTextSize); text.setSize(graphTextSize);
text.drawString( text.drawString(
activeGraph->publisher0Data.back().stringValue + " " + activeGraph->publisher0Data.back().unitMeasure, stringVal0 + " " + activeGraph->publisher0Data.back().unitMeasure,
val0.x + 10, val0.x + 10,
val0.y); val0.y);
text.drawString( text.drawString(
activeGraph->publisher1Data.back().stringValue + " " + activeGraph->publisher1Data.back().unitMeasure, stringVal1 + " " + activeGraph->publisher1Data.back().unitMeasure,
val1.x + 10, val1.x + 10,
val1.y); val1.y);
ofPopStyle(); ofPopStyle();
@ -157,6 +160,10 @@ void Scene::drawHUDCopy()
vector<DataObject> *p1Data = &activeGraph->publisher1Data; vector<DataObject> *p1Data = &activeGraph->publisher1Data;
if (activeGraph->publisher0Data.size() == 0) return;
string stringVal0 = reduceDecimalCount(activeGraph->publisher0Data.back().stringValue, 4);
string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, 4);
int amountToAverage = MIN(p0Data->size(), averageAmount); int amountToAverage = MIN(p0Data->size(), averageAmount);
@ -165,59 +172,67 @@ void Scene::drawHUDCopy()
if (p0Data->back().longlongIntValue > 0) if (p0Data->back().longlongIntValue > 0)
{ {
long long int average0 = 0; long long int average0 = 0;
for (int i = 0; i < (int)amountToAverage; i++) for (int i = 0; i < amountToAverage; i++)
average0 += p0Data->at(p0Data->size() - i - 1).value; average0 += p0Data->at(p0Data->size() - i - 1).value;
average0 /= (int)amountToAverage; average0 /= amountToAverage;
printf("l average0:%llu\n", average0);
string valueWithCommas = addCommasToNumberString(ofToString(average0)); string valueWithCommas = addCommasToNumberString(ofToString(average0));
printf("l av valueWithCommas:%s\n", valueWithCommas.c_str());
blStr = "Increase: " + ofToString(p0Data->back().value - p0Data->at(p0Data->size() - 2).value) + "\n" + blStr = "Increase: " + ofToString(p0Data->back().value - p0Data->at(p0Data->size() - 2).value) + "\n" +
"Current Value: " + p0Data->back().stringValue + "\n" + "Current Value: " + stringVal0 + "\n" +
"Running average: " + valueWithCommas; "Running average: " + reduceDecimalCount(valueWithCommas, 4);
drawTextBox(blStr, "BOTTOM LEFT"); drawTextBox(blStr, "BOTTOM LEFT");
} }
else else
{ {
float average0 = 0; float average0 = 0;
for (int i = 0; i < (int)amountToAverage; i++) for (int i = 0; i < amountToAverage; i++)
average0 += p0Data->at(p0Data->size() - i - 1).value; average0 += p0Data->at(p0Data->size() - i - 1).value;
average0 /= (int)amountToAverage; average0 /= amountToAverage;
printf("f average0:%f\n", average0);
string valueWithCommas = (average0 > 999) ? addCommasToNumberString(ofToString(average0)) : ofToString(average0); string valueWithCommas = (average0 > 999) ? addCommasToNumberString(ofToString(average0)) : ofToString(average0);
printf("f av valueWithCommas:%s\n", valueWithCommas.c_str());
blStr = "Increase: " + ofToString(p0Data->back().value - p0Data->at(p0Data->size() - 2).value) + "\n" + blStr = "Increase: " + ofToString(p0Data->back().value - p0Data->at(p0Data->size() - 2).value) + "\n" +
"Current Value: " + p0Data->back().stringValue + "\n" + "Current Value: " + stringVal0 + "\n" +
"Running average: " + valueWithCommas; "Running average: " + reduceDecimalCount(valueWithCommas, 4);
drawTextBox(blStr, "BOTTOM LEFT"); drawTextBox(blStr, "BOTTOM LEFT");
} }
if (p1Data->back().longlongIntValue > 0) if (p1Data->back().longlongIntValue > 0)
{ {
float average1 = 0; long long int average1 = 0;
for (int i = 0; i < (int)amountToAverage; i++) for (int i = 0; i < amountToAverage; i++)
average1 += p1Data->at(p1Data->size() - i - 1).value; average1 += p1Data->at(p1Data->size() - i - 1).value;
average1 /= (int)amountToAverage; average1 /= amountToAverage;
printf("l average0:%llu\n", average1);
string valueWithCommas = addCommasToNumberString(ofToString(average1)); string valueWithCommas = addCommasToNumberString(ofToString(average1));
printf("l av valueWithCommas:%s\n", valueWithCommas.c_str());
brStr = "Increase: " + ofToString(p1Data->back().value - p1Data->at(p1Data->size() - 2).value) + "\n" + brStr = "Increase: " + ofToString(p1Data->back().value - p1Data->at(p1Data->size() - 2).value) + "\n" +
"Current Value: " + p1Data->back().stringValue + "\n" + "Current Value: " + stringVal1 + "\n" +
"Running average: " + valueWithCommas; "Running average: " + reduceDecimalCount(valueWithCommas, 4);
drawTextBox(brStr, "BOTTOM RIGHT"); drawTextBox(brStr, "BOTTOM RIGHT");
} }
else else
{ {
long long int average1 = 0; float average1 = 0;
for (int i = 0; i < (int)amountToAverage; i++) for (int i = 0; i < amountToAverage; i++)
average1 += p1Data->at(p1Data->size() - i - 1).value; average1 += p1Data->at(p1Data->size() - i - 1).value;
average1 /= (int)amountToAverage; average1 /= amountToAverage;
printf("f average1:%f\n", average1);
string valueWithCommas = (average1 > 999) ? addCommasToNumberString(ofToString(average1)) : ofToString(average1); string valueWithCommas = (average1 > 999) ? addCommasToNumberString(ofToString(average1)) : ofToString(average1);
printf("f av valueWithCommas:%s\n", valueWithCommas.c_str());
brStr = "Increase: " + ofToString(p1Data->back().value - p1Data->at(p1Data->size() - 2).value) + "\n" + brStr = "Increase: " + ofToString(p1Data->back().value - p1Data->at(p1Data->size() - 2).value) + "\n" +
"Current Value: " + p1Data->back().stringValue + "\n" + "Current Value: " + stringVal1 + "\n" +
"Running average: " + valueWithCommas; "Running average: " + reduceDecimalCount(valueWithCommas, 4);
drawTextBox(brStr, "BOTTOM RIGHT"); drawTextBox(brStr, "BOTTOM RIGHT");
} }
} }
@ -287,8 +302,8 @@ void Scene::addNewData(vector<DataObject> newData)
bodyGraph.addNewData(newData); bodyGraph.addNewData(newData);
separateBodyGraph.addNewData(newData); separateBodyGraph.addNewData(newData);
tlStr = newData[0].info + newData[0].unitMeasure + "\n" + ofToString(newData[0].stringValue); tlStr = newData[0].info + newData[0].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[0].stringValue), 4);
trStr = newData[1].info + newData[1].unitMeasure + "\n" + ofToString(newData[1].stringValue); trStr = newData[1].info + newData[1].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[1].stringValue), 4);
} }
@ -343,3 +358,25 @@ string Scene::addCommasToNumberString(string num)
} }
return temp + fractional; return temp + fractional;
} }
string Scene::reduceDecimalCount(string num, int maxDecimal)
{
string temp;
string integral = num;
string fractional;
int decimalLocation = integral.find('.');
if (decimalLocation != -1)
{
integral = integral.substr(0, decimalLocation);
fractional = num.substr(decimalLocation + 1);
if (fractional.size() > maxDecimal) fractional = fractional.substr(0, maxDecimal);
return integral + "." + fractional;
}
else
{
return num;
}
}

1
of/Active Tripod/src/visual/Scene.h
View File

@ -28,6 +28,7 @@ public:
void clearGraphData(); void clearGraphData();
void keyPressed(int key); void keyPressed(int key);
string addCommasToNumberString(string num); string addCommasToNumberString(string num);
string reduceDecimalCount(string num, int maxDecimal);
BarGraph barGraph; BarGraph barGraph;
BodyGraph bodyGraph; BodyGraph bodyGraph;