From 6bd2d52c2d31797746381ed6ac00dfb37e0df376 Mon Sep 17 00:00:00 2001 From: James Alliban Date: Fri, 24 Jan 2014 14:48:57 +0000 Subject: [PATCH] Decimal point amount individually configurable --- of/Active Tripod/bin/Active_Tripod.lib | Bin 78700 -> 78700 bytes .../data/GUI/GRAPH GLOBALguiPagesettings.xml | 9 ++++++-- ...ARATE BODY GRAPH DESIGNguiPagesettings.xml | 2 +- of/Active Tripod/src/gui/GUI.cpp | 3 ++- of/Active Tripod/src/visual/Scene.cpp | 20 +++++++++--------- of/Active Tripod/src/visual/Scene.h | 5 +++-- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index dcf2061b7959de3b60d9c32de5fd9b2664fecb0f..b97ca0d52cd99dd5e1aff5911528dbabbfe8c934 100644 GIT binary patch delta 7248 zcmZ`-d2p5070-o)ge)ZCCGTa0M999qB&-!HxNj)6wbB_eMyH(-MiF&dDW#aHEiNNL z&)_Ws3`j&8T!Nq=QiPx=1zDm+5y1c>i$F-?Mll9@@A>ZUe)oko|K;4X{LX&9cjkEX znd8y(b7Mx27*idla8vM&F$K5!|E+!O)+*;;+Pb*bK87-?N9TEe_r%{K`bQo3)6v^Q zA}T75rY+50d(Dz>h2;$fYDSK7nEPqwwZC0D$YG&*%ToGl@{7yDhAg)viBe6Y{>!iN zmC?P+)0jGQ`8Y$(TUDB&kymXaEd47dQs8}%xnooL^mKBDD!iF;JWlL%Hc;w4a9BvB9mShoN2+1pd z4rNUtx__ldowIU0sLdf+H_R}1uY~2UU7prQ{^2uvK`2&1NLE33{>mUlH`^E(6jPcF z3g6>>Ad!kAW16@M@gBe5qrA83c7tdBc8_xXD>t|ZFEa>RU%ADQCmr?}uYA>K^e7u% zwUN-yLA3fcBkDtIdClkaWQ$(+DNbOPzK+0zn>@z+mcGeuY`G-aF{_~suFqZ#*Tc;r zIr zZf2=gEW?;3NK0ztDft7a-tto^b5tmf;fmwInjHB`mbI+V`DO9QT6nL5&VWmmRG|j^ z&|Mkw?S8^BuASm6Pk-|!16tW)%IPGUztby zTFN|KBL-0XI`F6h;`b5iy^P-0xNZ{_@UxFMBF-Z3F~enp7d4;rlNf8_}= zalL1Atdgr_x$vj}jopaQnar_EbKZuNnySz;wZ~FjeAOi0$)=RM<7G><7)*y3r~5!X zu?;581{$LusZi7^$vj#;Y5=uFpm%_dVC9ELCObe?+*yUr@ksTaA=mU18MJhH&=`)$ za_T=#mbpK;IEs|uXjL5Hj3CWhH#kz#COTo0je#>_=5BH(2fKHElj#P(0cX7Hk{GPE zIgXBO4#?VQ5pqmoGSqLr!NA7|_~H`E9b3SI#@n;S?N0061m#`o6G1sG&MAGbS~s<# zdDWz5f#C|;)k>f>GeDEJq6C4fd8=cS`SrfIR`Ium(rNsA;72zsd=K3K4Waj;0lVS3 z_c7){iP>f-eh_DFbA!mC?goj%W-#CX!6i&bKq4sr&4+!>?XncN>L+YR#sPiPc0lKv zQmxGq(5-#DiopC~IrPA(V!z(`RX64@`L$3Mg=_*+c6bT6Vu!g7uoyS(Fck{Il{@bwSqEw7bw`d&ASjC@Z|2cJZ3F4?(Vx5dUvDn z^u57;7bw5$bX^n#Xx^R@w;8dlzTSi4&~bMsemx6j)6;uVP$o01T5pnjnInxZ?yWSc zSD)}ATGwVG>K9LY8>$?syz^s|N}s9iV=$qeZv4b}wcxNhY&L&_6|VBfOCqeW+^?6! zgM~wA>c0Wk-62!;^Vz}-8CwuB5fR`k_W1$!ua_1}1)Tg(?OIhMsPji}49ib(`(RSU zeugrIWW#5W1m&Ei;5vC=zj4i78QuHM${=^fKT6_2CT)B&k+Sx{VMM>@b6mTi%sK#y z$+EWw4xqc-0sa_?FLG$%7o{erDqWoM5*6i{D&u?0Gw9T5XGUwVbr;NjJLvAWgWi7A zn`IU?917C1-z898IEHdRM_;&jW*q_^L*+TGH}Y(j4t#0qOxFUx)vC8Y^IPMWqx|yL zb!=tl@cWX=SjuWgq})h8?#Z_s`MxW$fuF}bokC|AeW}*vC#m~rkZid0jEV@!Q~aLtj2jY^ zO5ImJ0O=R1$VXE%Lq$AA*&Du?Q(#?phQP&aVw!&AmF`<-;#X_#@R(n4+F^{GQt!$1Xw{MBb5p!{Q_ zRm$ihYV8Qn-ZSR3j41TQ{5Gj$tXDJsXXVBYOn&?ISA7;agV$_Ad%cvZJM(GpS+fqX z;>tR4dt;No)(IV$SOr~}VQ$_Rbs_IaAluR_`6YU>E1kZ4HlD_HBLJ$1c%JAsSfT1* z&xA}`XJ0W2lfS`~cjwPa#h*VfgVuh7nn7_SeT(8ikv{vaDN>c7kM&stM;|09);?^UhZDKh=wV#Ja*qru-4tg!-npYb~b7^7R=Y@6e3i zAWaz;OMmY{UeSWxJ#Yw==|A&<7;g~?uznAK$Ewko+SI`p$7IeDP_EosNjf&^i(Mzr4hT5dtJsPWVSwM-HM z#bF9jJ|~39yyZ&mXSqz@Fd)6ywsRn-kBN0YZcRtZ)cyi3>F%o?T12+=7g%_zEbX`Q zPCanCAIgwpqT!#tuHY<{DW17n0K6Q6Zf3|N`Qcy;&ekuwH}fJ_`9D$M3G zjU%TG5a4D(&4LZzo>O~+MLIQ`r8~X1Jq>DK*&W~?U)sW$;GFP}1nO2ose{(Yt zXfqcXzMiM&m6195YBCN@kl`%&&37ZR^i&pvBPL^yY|IuxTKM}xvdZyY{o>`#V)<0I zFvFM>Xzmt$==8FjtjfVmjd;D_X-)Yhx^D3slzA1`T7FH!;~6_+B_fkjZj7dunS6$T@ZvJDu928;LOXHGaahI9E77RO6RwC|pAGCFT*jOU& zv0?X=Of0qah)gi+wo*GB%*`gRFT*yr)x4n$(h9rGE;n|n%Tb12m{#CnV|gUx+6ohw ztChP$Wox;ppxm2c>Avk|x7d0=R1s0{&i8x1?5-3!a&9I1RZgn%evpx;E8(wCn_XpT zI@9cIau~3zy(MAT)7{Ni80STod7-SX5kn$>&ErS?YhIClERegaMVSdTTDGj_|Eny~ ZQWZUe)oko|K;4X{LX&9clucL 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 diff --git a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml index b8ddd25..3e679a7 100644 --- a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml +++ b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml @@ -31,8 +31,13 @@ 4 - Decimal points (All) - 2.924342155 + Decimal points 0 + 5.174342155 + + + 4 + Decimal points 1 + 2.332236767 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 20acb27..8fadc04 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 @@ -26,7 +26,7 @@ 4 Data send speed (seconds) - 4.682236671 + 0.950986862 4 diff --git a/of/Active Tripod/src/gui/GUI.cpp b/of/Active Tripod/src/gui/GUI.cpp index 5087d98..ffb96ed 100644 --- a/of/Active Tripod/src/gui/GUI.cpp +++ b/of/Active Tripod/src/gui/GUI.cpp @@ -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); diff --git a/of/Active Tripod/src/visual/Scene.cpp b/of/Active Tripod/src/visual/Scene.cpp index 416b55c..51a198b 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, 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 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); } diff --git a/of/Active Tripod/src/visual/Scene.h b/of/Active Tripod/src/visual/Scene.h index 743baca..967bd13 100644 --- a/of/Active Tripod/src/visual/Scene.h +++ b/of/Active Tripod/src/visual/Scene.h @@ -93,6 +93,7 @@ public: float topColourBoxXOffset; float bottomColourBoxXOffset; float colourBoxThickness; - - float valDecimalPoints; + + float valDecimalPoints0; + float valDecimalPoints1; }; \ No newline at end of file