From c5ed56226d80865a798ba01b66aadc8bb155f1b4 Mon Sep 17 00:00:00 2001 From: Stefan Karlsson Date: Sun, 12 Jul 2015 23:54:37 +0200 Subject: [PATCH] LP-10 Update previous abs float fix to use fabs Previous fix casted the float arguments to ints. Use a fabs instead, since it gives easier code to read. The beSmooth check was also moved to further enhance the readability of the code. --- ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp index b44f062bb..14bfba5cb 100644 --- a/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp @@ -29,6 +29,7 @@ #include "dialgadgetwidget.h" #include #include +#include #include #include @@ -558,7 +559,7 @@ void DialGadgetWidget::rotateNeedles() int dialRun = 3; if (n2enabled) { double needle2Diff; - if (abs(int((needle2Value - needle2Target) * 10)) > 5 && beSmooth) { + if (beSmooth && fabs(needle2Value - needle2Target) > 0.5) { needle2Diff = (needle2Target - needle2Value) / 5; } else { needle2Diff = needle2Target - needle2Value; @@ -590,7 +591,7 @@ void DialGadgetWidget::rotateNeedles() // We assume that needle1 always exists! double needle1Diff; - if ((abs(int((needle1Value - needle1Target) * 10)) > 5) && beSmooth) { + if (beSmooth && fabs(needle1Value - needle1Target) > 0.5) { needle1Diff = (needle1Target - needle1Value) / 5; } else { needle1Diff = needle1Target - needle1Value; @@ -614,7 +615,7 @@ void DialGadgetWidget::rotateNeedles() if (n3enabled) { double needle3Diff; - if ((abs(int((needle3Value - needle3Target) * 10)) > 5) && beSmooth) { + if (beSmooth && fabs(needle3Value - needle3Target) > 0.5) { needle3Diff = (needle3Target - needle3Value) / 5; } else { needle3Diff = needle3Target - needle3Value;