From 8c4e4236bce1a78ff9d8c94ce97c45bce43952fd Mon Sep 17 00:00:00 2001 From: James Alliban Date: Fri, 24 Jan 2014 04:19:27 +0000 Subject: [PATCH] Decimal point count configurable in GUI... ... See Graph Global power --- of/Active Tripod/bin/Active_Tripod.lib | Bin 78700 -> 78700 bytes .../data/GUI/GRAPH GLOBALguiPagesettings.xml | 5 +++++ of/Active Tripod/src/gui/GUI.cpp | 1 + of/Active Tripod/src/visual/Scene.cpp | 20 +++++++++--------- of/Active Tripod/src/visual/Scene.h | 2 ++ 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index 84ffa71ab7449360c90c511652e05bc892f77bc6..dcf2061b7959de3b60d9c32de5fd9b2664fecb0f 100644 GIT binary patch delta 6729 zcmZ`-dr+0f6=(4ZctN;w;oi$b1Ro%mhZj)Pl(A?M$6Di1>o`uw3ffMm!PFQh(;90H zP91Aaii~GuW7TR!<1;|isv$nm7-NkOOrkLc6`lA9B0{3Zx7|H^cE9hE>HTka&)M_( zo!{B-wq0|yU2{~WI0_33he4pm^Zu~(@n*4O&iH_}fm#o(Z)mFel{v?;ZXwOr zFHi8YkdO$Nu_kH93#;!iE$WHQA5v(O4HdFGe!IqH2|(pqSE$%ryEb2K^2VObFLoew z-Dq*-t&-*sMcUrl)LH zrcG#H&<2Q1NjJuAp==hP!}Xyp6O{{9M{zxR>sXsheU(d%TL}RrEhsc%n-RkGo^3i{ z83!o^-cw4(mD=}=6l$f{nza@EziM@^Yfvb)F1U7;bzN%bsHa;fzO^5y&_NZdZq2wA-$RkfJ>jK{?xEhZyOjs5AqiYloxIM$VxeV~$M}ajAE948L ze-{a*f$q@zE8BP>N9JD8Jgb~TXXFt43#z&=D&WX6<57V)nvX|IFAg>!qymZO4Wh=UMkc^6eMrO= z{hjsAVt8Yt5KgP~!H(|;3{>~1@2Tzty0^bqphLb#ZTWKABD7OSdgPPa){8VE=HF2& zdIH?PL-y&)d3OoNnrQD*5@>e6a*tdfXtmw5LyJaV*$;$2y5!;yR4M%(Jn?>)jbpT- zpDD!;=vta9J0Dnc#e9aQKQy1A*pt-{X=saYRXtc7kF-peR&RjUo_OHbMd9$yBdQm5 zPsbzjp4KxT2d~>`ty5V3Qx7^8A4MDZ%dR6Qve z?h4fsUAgfnChXN=;nugDY9#LJ#;B9*6XTea=XKo}4IBY5^I7<*q=wE}K0eGr5$Puj zuW~SILs>=j=K_!D&Q$%4*xc?UhC7%miTzXjwJ_%9QDH0>1E-e}FArmcYvBe;%ceZ7 zq@RYd07{$Nr-o}M6oUELa7KtFvf<+*w1}V&3{3u)aYhElW_zIdAc0Et2`}ow2+^t$ zd3_J<5t;Bi$%OWKty4?T9f^_p4#il!GE(~>F2$(itD~8xMY1?JIXjGJMCqruHI{fq z6jLN-!hIZNPo^P~OM*!DJ3X*+yP_e@yu7Wac2zMtpB`;IyP+KECmgxLeS`}VL(eqn zZH1T7b66C?WcM!l@hrK!^~VrVLxs1rJ}8+8 zFX-^8y3zF~r-3rQ`~(`%S^3TNOgMY6I*||QZPg45U)ftD%APpJBA}x>0p?t#Hn%0D zB1NN1y_Wdn6c+UGll55G#}qH#*JSjsJo2C27H}Sl!ojBK?Pk zA<7quQ~2EZq6czDhr^Wr>hYt%AfJ1Yc%I1P`!V|N6o!NUB8(ytu0;d_@qVe_6A#mP zYJXE}d>!&R{f$p*qs?qktYrg!gf-qWfWXFQ4W!SQ5yDC=&&y;9;QE;Z>fVUutJ2As zl=AXR=}b-AVj=3*qCTFT5hV6%28oRlVsTo`0mD~#_d$0lwry!wZZ~AI>53AGx5oK3%5=`9*kQkJZ1oJ{qqArZ(*Het zPZsG3XL(Y#x;>Ch*it#!K-&%3K`s{LP!66KvGw5xvsn)G9vcq7IZBUCLT_`99lf^C z)HL3i%aZxua;fKd$sqh!fw$&TbY^GXAiX1NiEs~)GeBlm1;~v0qer|XG4T?(={zr= xr3C%SglFo`uw`f8`sU`mXWX^pi8 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 v^d}RZ$v>GgSize 29.424343109 + + 4 + Decimal points (All) + 2.924342155 + 4 Red diff --git a/of/Active Tripod/src/gui/GUI.cpp b/of/Active Tripod/src/gui/GUI.cpp index de74c65..5087d98 100644 --- a/of/Active Tripod/src/gui/GUI.cpp +++ b/of/Active Tripod/src/gui/GUI.cpp @@ -75,6 +75,7 @@ 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("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); diff --git a/of/Active Tripod/src/visual/Scene.cpp b/of/Active Tripod/src/visual/Scene.cpp index 62b922e..416b55c 100644 --- a/of/Active Tripod/src/visual/Scene.cpp +++ b/of/Active Tripod/src/visual/Scene.cpp @@ -86,8 +86,8 @@ void Scene::drawGraphValues() val1 = activeGraph->graphTextPnt1; } - string stringVal0 = reduceDecimalCount(activeGraph->publisher0Data.back().stringValue, 4); - string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, 4); + string stringVal0 = reduceDecimalCount(activeGraph->publisher0Data.back().stringValue, valDecimalPoints); + string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, valDecimalPoints); 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, 4); - string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, 4); + string stringVal0 = reduceDecimalCount(activeGraph->publisher0Data.back().stringValue, valDecimalPoints); + string stringVal1 = reduceDecimalCount(activeGraph->publisher1Data.back().stringValue, valDecimalPoints); 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, 4); + "Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints); 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, 4); + "Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints); 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, 4); + "Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints); 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, 4); + "Running average: " + reduceDecimalCount(valueWithCommas, valDecimalPoints); drawTextBox(brStr, "BOTTOM RIGHT"); } } @@ -319,8 +319,8 @@ void Scene::addNewData(vector newData) bodyGraph.addNewData(newData); separateBodyGraph.addNewData(newData); - tlStr = newData[0].info + newData[0].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[0].stringValue), 4); - trStr = newData[1].info + newData[1].unitMeasure + "\n" + reduceDecimalCount(ofToString(newData[1].stringValue), 4); + 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); } diff --git a/of/Active Tripod/src/visual/Scene.h b/of/Active Tripod/src/visual/Scene.h index ccbe98c..743baca 100644 --- a/of/Active Tripod/src/visual/Scene.h +++ b/of/Active Tripod/src/visual/Scene.h @@ -93,4 +93,6 @@ public: float topColourBoxXOffset; float bottomColourBoxXOffset; float colourBoxThickness; + + float valDecimalPoints; }; \ No newline at end of file