[Libreoffice-commits] core.git: chart2/source

[Tomaž Vajngerl]

 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx |   12 ++++-----
 chart2/source/inc/BaseGFXHelper.hxx                      |    3 --
 chart2/source/tools/BaseGFXHelper.cxx                    |   10 -------
 chart2/source/tools/ThreeDHelper.cxx                     |   20 ++++++---------
 4 files changed, 15 insertions(+), 30 deletions(-)

New commits:
commit df98a363f33c3c221286520ee0c412e264b6f411
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Wed Jan 18 10:26:22 2017 +0100

    chart2: replace custom Deg2Rad/Rad2Deg for basegfx functions
    
    Change-Id: Idbc843b54b3037bd55199a8918b06d21eb7b2f2c
    Reviewed-on: https://gerrit.libreoffice.org/33343
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index af8174f..f07864ff 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -79,9 +79,9 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow
     double fXAngle, fYAngle, fZAngle;
     ThreeDHelper::getRotationAngleFromDiagram( m_xSceneProperties, fXAngle, fYAngle, fZAngle );
 
-    fXAngle = BaseGFXHelper::Rad2Deg( fXAngle );
-    fYAngle = BaseGFXHelper::Rad2Deg( fYAngle );
-    fZAngle = BaseGFXHelper::Rad2Deg( fZAngle );
+    fXAngle = basegfx::rad2deg(fXAngle);
+    fYAngle = basegfx::rad2deg(fYAngle);
+    fZAngle = basegfx::rad2deg(fZAngle);
 
     OSL_ENSURE( fZAngle>=-90 && fZAngle<=90, "z angle is out of valid range" );
 
@@ -186,9 +186,9 @@ void ThreeD_SceneGeometry_TabPage::applyAnglesToModel()
     fYAngle = double(-1.0*m_nYRotation)/double(pow(10.0,m_pMFYRotation->GetDecimalDigits()));
     fZAngle = double(-1.0*m_nZRotation)/double(pow(10.0,m_pMFZRotation->GetDecimalDigits()));
 
-    fXAngle = BaseGFXHelper::Deg2Rad( fXAngle );
-    fYAngle = BaseGFXHelper::Deg2Rad( fYAngle );
-    fZAngle = BaseGFXHelper::Deg2Rad( fZAngle );
+    fXAngle = basegfx::deg2rad(fXAngle);
+    fYAngle = basegfx::deg2rad(fYAngle);
+    fZAngle = basegfx::deg2rad(fZAngle);
 
     ThreeDHelper::setRotationAngleToDiagram( m_xSceneProperties, fXAngle, fYAngle, fZAngle );
 
diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx
index 2a35146..fe607b1 100644
--- a/chart2/source/inc/BaseGFXHelper.hxx
+++ b/chart2/source/inc/BaseGFXHelper.hxx
@@ -82,9 +82,6 @@ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DTuple GetScaleFromMatrix(
 
 void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix );
 
-OOO_DLLPUBLIC_CHARTTOOLS double Deg2Rad( double fDegrees );
-OOO_DLLPUBLIC_CHARTTOOLS double Rad2Deg( double fRadians );
-
 } //  namespace BaseGFXHelper
 } //  namespace chart
 
diff --git a/chart2/source/tools/BaseGFXHelper.cxx b/chart2/source/tools/BaseGFXHelper.cxx
index 57f3a77..aeae59d 100644
--- a/chart2/source/tools/BaseGFXHelper.cxx
+++ b/chart2/source/tools/BaseGFXHelper.cxx
@@ -194,16 +194,6 @@ void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix )
     rB3DMatrix = aRotationMatrix;
 }
 
-double Deg2Rad( double fDegrees )
-{
-    return fDegrees * ( F_PI / 180.0 );
-}
-
-double Rad2Deg( double fRadians )
-{
-    return fRadians * ( 180.0 / F_PI );
-}
-
 } //  namespace BaseGFXHelper
 } //  namespace chart
 
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index e89d9ab..14b0461 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -884,8 +884,8 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg(
             E+=F_PI;
     }
 
-    rnElevationDeg = ::basegfx::fround( BaseGFXHelper::Rad2Deg( E ) );
-    rnRotationDeg = ::basegfx::fround( BaseGFXHelper::Rad2Deg( R ) );
+    rnElevationDeg = basegfx::fround(basegfx::rad2deg(E));
+    rnRotationDeg = basegfx::fround(basegfx::rad2deg(R));
 }
 
 double ThreeDHelper::getValueClippedToRange( double fAngle, const double& fPositivLimit )
@@ -899,8 +899,8 @@ double ThreeDHelper::getValueClippedToRange( double fAngle, const double& fPosit
 
 void ThreeDHelper::adaptRadAnglesForRightAngledAxes( double& rfXAngleRad, double& rfYAngleRad )
 {
-    rfXAngleRad = ThreeDHelper::getValueClippedToRange(rfXAngleRad, BaseGFXHelper::Deg2Rad(ThreeDHelper::getXDegreeAngleLimitForRightAngledAxes()) );
-    rfYAngleRad = ThreeDHelper::getValueClippedToRange(rfYAngleRad, BaseGFXHelper::Deg2Rad(ThreeDHelper::getYDegreeAngleLimitForRightAngledAxes()) );
+    rfXAngleRad = ThreeDHelper::getValueClippedToRange(rfXAngleRad, basegfx::deg2rad(ThreeDHelper::getXDegreeAngleLimitForRightAngledAxes()) );
+    rfYAngleRad = ThreeDHelper::getValueClippedToRange(rfYAngleRad, basegfx::deg2rad(ThreeDHelper::getYDegreeAngleLimitForRightAngledAxes()) );
 }
 
 void ThreeDHelper::getRotationAngleFromDiagram(
@@ -1046,11 +1046,9 @@ void ThreeDHelper::getRotationFromDiagram( const uno::Reference< beans::XPropert
     }
     else
     {
-        rnHorizontalAngleDegree = basegfx::fround(
-            BaseGFXHelper::Rad2Deg(fXAngle));
-        rnVerticalAngleDegree = basegfx::fround(
-            -1.0 * BaseGFXHelper::Rad2Deg(fYAngle));
-        // nZRotation = basegfx::fround(-1.0 * BaseGFXHelper::Rad2Deg(fZAngle));
+        rnHorizontalAngleDegree = basegfx::fround(basegfx::rad2deg(fXAngle));
+        rnVerticalAngleDegree = basegfx::fround(-1.0 * basegfx::rad2deg(fYAngle));
+        // nZRotation = basegfx::fround(-1.0 * basegfx::rad2deg(fZAngle));
     }
 
     lcl_shiftAngleToIntervalMinus180To180( rnHorizontalAngleDegree );
@@ -1061,8 +1059,8 @@ void ThreeDHelper::setRotationToDiagram( const uno::Reference< beans::XPropertyS
             , sal_Int32 nHorizontalAngleDegree, sal_Int32 nVerticalYAngleDegree )
 {
     //todo: x and y is not equal to horz and vert in case of RightAngledAxes==false
-    double fXAngle = BaseGFXHelper::Deg2Rad( nHorizontalAngleDegree );
-    double fYAngle = BaseGFXHelper::Deg2Rad( -1*nVerticalYAngleDegree );
+    double fXAngle = basegfx::deg2rad(nHorizontalAngleDegree);
+    double fYAngle = basegfx::deg2rad(-1 * nVerticalYAngleDegree);
     double fZAngle = 0.0;
 
     if( !lcl_isRightAngledAxesSetAndSupported( xSceneProperties ) )