diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-03-19 21:27:20 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-03-19 22:28:59 +0100 |
| commit | 166a4989a0d1e5a6271c66bceb73a27970afc882 (patch) | |
| tree | a5701345344d15afe1eaab1550ca82e8222d14df /chart2/source/view/main/PlottingPositionHelper.cxx | |
| parent | 711109008bd2a13bc5db2fed35de53d02af2dd3d (diff) | |
tdf#123504: 0 and 360 are different angles in charts
This partly reverts commit 81302f33073e7629d724ed269f1fa21dad29e141.
Change-Id: I40cbe739eb4497b8217aca56a2c3661ed1e491f4
Reviewed-on: https://gerrit.libreoffice.org/69440
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'chart2/source/view/main/PlottingPositionHelper.cxx')
| -rw-r--r-- | chart2/source/view/main/PlottingPositionHelper.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index 2382894e383a..c2c2d25b4c9c 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/drawing/XShapes.hpp> #include <rtl/math.hxx> -#include <tools/helpers.hxx> namespace chart { @@ -417,10 +416,11 @@ double PolarPlottingPositionHelper::getWidthAngleDegree( double& fStartLogicValu && !::rtl::math::approxEqual( fStartLogicValueOnAngleAxis, fEndLogicValueOnAngleAxis ) ) fWidthAngleDegree = 360.0; - while(fWidthAngleDegree<0.0) - fWidthAngleDegree+=360.0; - while(fWidthAngleDegree>360.0) - fWidthAngleDegree-=360.0; + // tdf#123504: both 0 and 360 are valid and different values here! + while (fWidthAngleDegree < 0.0) + fWidthAngleDegree += 360.0; + while (fWidthAngleDegree > 360.0) + fWidthAngleDegree -= 360.0; return fWidthAngleDegree; } @@ -473,7 +473,12 @@ double PolarPlottingPositionHelper::transformToAngleDegree( double fLogicValueOn fRet = m_fAngleDegreeOffset + fAxisAngleScaleDirection*(fScaledLogicAngleValue-MinAngleValue)*360.0 /fabs(MaxAngleValue-MinAngleValue); - return NormAngle360(fRet); + // tdf#123504: both 0 and 360 are valid and different values here! + while (fRet > 360.0) + fRet -= 360.0; + while (fRet < 0) + fRet += 360.0; + return fRet; } /** |