[Libreoffice-commits] core.git: chart2/source
Stephan Bergmann
sbergman at redhat.com
Tue Oct 14 06:09:10 PDT 2014
chart2/source/view/axes/Tickmarks.cxx | 6 -
chart2/source/view/axes/VAxisProperties.cxx | 48 ++++++------
chart2/source/view/axes/VAxisProperties.hxx | 17 +++-
chart2/source/view/axes/VCartesianAxis.cxx | 102 ++++++++++++++-------------
chart2/source/view/axes/VCartesianAxis.hxx | 4 -
chart2/source/view/axes/VPolarRadiusAxis.cxx | 6 -
6 files changed, 100 insertions(+), 83 deletions(-)
New commits:
commit 658f031bb155474fa64e69fb76326b29ef4a642c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 14 15:07:31 2014 +0200
Revert "Revert "Make VCartesianAxis::get2DAxisMainLine() truly const method.""
This reverts commit bf302000ea8849ac7ecd9162f3014bac9da4406e,
as clarified on IRC, --enable-chart-tests is known flaky and not intended to be
used by anybody but moggi.
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 9942753..a8cd9a5 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -237,7 +237,7 @@ B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties& rAxisP
|| ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == rAxisProperties.m_eLabelPos )
bFarAwayLabels = true;
- double fInnerDirectionSign = rAxisProperties.m_fInnerDirectionSign;
+ double fInnerDirectionSign = rAxisProperties.maLabelAlignment.mfInnerTickDirection;
if( fInnerDirectionSign==0.0 )
fInnerDirectionSign = 1.0;
@@ -269,11 +269,11 @@ B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties& rAxisP
}
B2DVector aLabelDirection(aStart);
- if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign )
+ if (rAxisProperties.maLabelAlignment.mfInnerTickDirection != rAxisProperties.maLabelAlignment.mfLabelDirection)
aLabelDirection = aEnd;
B2DVector aOrthoLabelDirection(aOrthoDirection);
- if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign )
+ if (rAxisProperties.maLabelAlignment.mfInnerTickDirection != rAxisProperties.maLabelAlignment.mfLabelDirection)
aOrthoLabelDirection*=-1.0;
aOrthoLabelDirection.normalize();
if( bIncludeSpaceBetweenTickAndText )
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 80c2261..9b449d5 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -30,11 +30,16 @@
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
-namespace chart
-{
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
+namespace chart {
+
+AxisLabelAlignment::AxisLabelAlignment() :
+ mfLabelDirection(1.0),
+ mfInnerTickDirection(1.0),
+ meAlignment(LABEL_ALIGN_RIGHT_TOP) {}
+
sal_Int32 lcl_calcTickLengthForDepth(sal_Int32 nDepth,sal_Int32 nTickmarkStyle)
{
sal_Int32 nWidth = AXIS2D_TICKLENGTH; //@maybefuturetodo this length could be offered by the model
@@ -112,7 +117,7 @@ TickmarkProperties AxisProperties::makeTickmarkProperties(
nTickmarkStyle = m_nMinorTickmarks;
}
- if( m_fInnerDirectionSign == 0.0 )
+ if (maLabelAlignment.mfInnerTickDirection == 0.0)
{
if( nTickmarkStyle != 0 )
nTickmarkStyle = 3; //inner and outer tickmarks
@@ -128,7 +133,7 @@ TickmarkProperties AxisProperties::makeTickmarkProperties(
TickmarkProperties AxisProperties::makeTickmarkPropertiesForComplexCategories(
sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 /*nTextLevel*/ ) const
{
- sal_Int32 nTickmarkStyle = (m_fLabelDirectionSign==m_fInnerDirectionSign) ? 2/*outside*/ : 1/*inside*/;
+ sal_Int32 nTickmarkStyle = (maLabelAlignment.mfLabelDirection == maLabelAlignment.mfInnerTickDirection) ? 2/*outside*/ : 1/*inside*/;
TickmarkProperties aTickmarkProperties;
aTickmarkProperties.Length = nTickLength;// + nTextLevel*( lcl_calcTickLengthForDepth(0,nTickmarkStyle) );
@@ -158,9 +163,6 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel
, m_eTickmarkPos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS )
, m_bCrossingAxisHasReverseDirection(false)
, m_bCrossingAxisIsCategoryAxes(false)
- , m_fLabelDirectionSign(1.0)
- , m_fInnerDirectionSign(1.0)
- , m_aLabelAlignment(LABEL_ALIGN_RIGHT_TOP)
, m_bDisplayLabels( true )
, m_nNumberFormatKey(0)
, m_nMajorTickmarks(1)
@@ -185,9 +187,7 @@ AxisProperties::AxisProperties( const AxisProperties& rAxisProperties )
, m_eTickmarkPos( rAxisProperties.m_eTickmarkPos )
, m_bCrossingAxisHasReverseDirection( rAxisProperties.m_bCrossingAxisHasReverseDirection )
, m_bCrossingAxisIsCategoryAxes( rAxisProperties.m_bCrossingAxisIsCategoryAxes )
- , m_fLabelDirectionSign( rAxisProperties.m_fLabelDirectionSign )
- , m_fInnerDirectionSign( rAxisProperties.m_fInnerDirectionSign )
- , m_aLabelAlignment( rAxisProperties.m_aLabelAlignment )
+ , maLabelAlignment( rAxisProperties.maLabelAlignment )
, m_bDisplayLabels( rAxisProperties.m_bDisplayLabels )
, m_nNumberFormatKey( rAxisProperties.m_nNumberFormatKey )
, m_nMajorTickmarks( rAxisProperties.m_nMajorTickmarks )
@@ -209,7 +209,7 @@ AxisProperties::AxisProperties( const AxisProperties& rAxisProperties )
LabelAlignment lcl_getLabelAlignmentForZAxis( const AxisProperties& rAxisProperties )
{
LabelAlignment aRet( LABEL_ALIGN_RIGHT );
- if( rAxisProperties.m_fLabelDirectionSign<0 )
+ if (rAxisProperties.maLabelAlignment.mfLabelDirection < 0)
aRet = LABEL_ALIGN_LEFT;
return aRet;
}
@@ -217,7 +217,7 @@ LabelAlignment lcl_getLabelAlignmentForZAxis( const AxisProperties& rAxisPropert
LabelAlignment lcl_getLabelAlignmentForYAxis( const AxisProperties& rAxisProperties )
{
LabelAlignment aRet( LABEL_ALIGN_RIGHT );
- if( rAxisProperties.m_fLabelDirectionSign<0 )
+ if (rAxisProperties.maLabelAlignment.mfLabelDirection < 0)
aRet = LABEL_ALIGN_LEFT;
return aRet;
}
@@ -225,7 +225,7 @@ LabelAlignment lcl_getLabelAlignmentForYAxis( const AxisProperties& rAxisPropert
LabelAlignment lcl_getLabelAlignmentForXAxis( const AxisProperties& rAxisProperties )
{
LabelAlignment aRet( LABEL_ALIGN_BOTTOM );
- if( rAxisProperties.m_fLabelDirectionSign<0 )
+ if (rAxisProperties.maLabelAlignment.mfLabelDirection < 0)
aRet = LABEL_ALIGN_TOP;
return aRet;
}
@@ -291,35 +291,35 @@ void AxisProperties::init( bool bCartesian )
m_bComplexCategories = true;
if( ::com::sun::star::chart::ChartAxisPosition_END == m_eCrossoverType )
- m_fInnerDirectionSign = m_bCrossingAxisHasReverseDirection ? 1 : -1;
+ maLabelAlignment.mfInnerTickDirection = m_bCrossingAxisHasReverseDirection ? 1.0 : -1.0;
else
- m_fInnerDirectionSign = m_bCrossingAxisHasReverseDirection ? -1 : 1;
+ maLabelAlignment.mfInnerTickDirection = m_bCrossingAxisHasReverseDirection ? -1.0 : 1.0;
if( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS == m_eLabelPos )
- m_fLabelDirectionSign = m_fInnerDirectionSign;
+ maLabelAlignment.mfLabelDirection = maLabelAlignment.mfInnerTickDirection;
else if( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE == m_eLabelPos )
- m_fLabelDirectionSign = -m_fInnerDirectionSign;
+ maLabelAlignment.mfLabelDirection = -maLabelAlignment.mfInnerTickDirection;
else if( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START == m_eLabelPos )
- m_fLabelDirectionSign = m_bCrossingAxisHasReverseDirection ? -1 : 1;
+ maLabelAlignment.mfLabelDirection = m_bCrossingAxisHasReverseDirection ? -1 : 1;
else if( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == m_eLabelPos )
- m_fLabelDirectionSign = m_bCrossingAxisHasReverseDirection ? 1 : -1;
+ maLabelAlignment.mfLabelDirection = m_bCrossingAxisHasReverseDirection ? 1 : -1;
if( m_nDimensionIndex==2 )
- m_aLabelAlignment = lcl_getLabelAlignmentForZAxis(*this);
+ maLabelAlignment.meAlignment = lcl_getLabelAlignmentForZAxis(*this);
else
{
bool bIsYAxisPosition = (m_nDimensionIndex==1 && !m_bSwapXAndY)
|| (m_nDimensionIndex==0 && m_bSwapXAndY);
if( bIsYAxisPosition )
{
- m_fLabelDirectionSign*=-1;
- m_fInnerDirectionSign*=-1;
+ maLabelAlignment.mfLabelDirection *= -1.0;
+ maLabelAlignment.mfInnerTickDirection *= -1.0;
}
if( bIsYAxisPosition )
- m_aLabelAlignment = lcl_getLabelAlignmentForYAxis(*this);
+ maLabelAlignment.meAlignment = lcl_getLabelAlignmentForYAxis(*this);
else
- m_aLabelAlignment = lcl_getLabelAlignmentForXAxis(*this);
+ maLabelAlignment.meAlignment = lcl_getLabelAlignmentForXAxis(*this);
}
}
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index b43f97b..7495c21 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -84,6 +84,16 @@ struct AxisLabelProperties SAL_FINAL
bool getIsStaggered() const;
};
+struct AxisLabelAlignment
+{
+ double mfLabelDirection; /// which direction the labels are to be drawn.
+ double mfInnerTickDirection; /// which direction the inner tickmarks are to be drawn.
+
+ LabelAlignment meAlignment;
+
+ AxisLabelAlignment();
+};
+
struct AxisProperties SAL_FINAL
{
css::uno::Reference<css::chart2::XAxis> m_xAxisModel;
@@ -102,11 +112,8 @@ struct AxisProperties SAL_FINAL
bool m_bCrossingAxisHasReverseDirection;
bool m_bCrossingAxisIsCategoryAxes;
- //this direction is used to indicate in which direction the labels are to be drawn
- double m_fLabelDirectionSign;
- //this direction is used to indicate in which direction inner tickmarks are to be drawn
- double m_fInnerDirectionSign;
- LabelAlignment m_aLabelAlignment;
+ AxisLabelAlignment maLabelAlignment;
+
bool m_bDisplayLabels;
sal_Int32 m_nNumberFormatKey;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 827973e..d28c031 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -98,7 +98,7 @@ Reference< drawing::XShape > createSingleLabel(
->createText( xTarget, aLabel, rPropNames, rPropValues, aATransformation );
LabelPositionHelper::correctPositionForRotation( xShape2DText
- , rAxisProperties.m_aLabelAlignment, rAxisLabelProperties.fRotationAngleDegree, rAxisProperties.m_bComplexCategories );
+ , rAxisProperties.maLabelAlignment.meAlignment, rAxisLabelProperties.fRotationAngleDegree, rAxisProperties.m_bComplexCategories );
return xShape2DText;
}
@@ -649,7 +649,7 @@ bool VCartesianAxis::createTextShapes(
, nLimitedSpaceForText, bLimitedHeight );
LabelPositionHelper::doDynamicFontResize( aPropValues, aPropNames, xProps
, m_aAxisLabelProperties.m_aFontReferenceSize );
- LabelPositionHelper::changeTextAdjustment( aPropValues, aPropNames, m_aAxisProperties.m_aLabelAlignment );
+ LabelPositionHelper::changeTextAdjustment( aPropValues, aPropNames, m_aAxisProperties.maLabelAlignment.meAlignment );
uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,"CharColor");
sal_Int32 nColor = Color( COL_AUTO ).GetColor();
@@ -922,7 +922,8 @@ struct lcl_GreaterYPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLog
}
};
-void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, double fCrossesOtherAxis )
+void VCartesianAxis::get2DAxisMainLine(
+ B2DVector& rStart, B2DVector& rEnd, AxisLabelAlignment& rAlignment, double fCrossesOtherAxis ) const
{
//m_aAxisProperties might get updated and changed here because
// the label alignmant and inner direction sign depends exactly of the choice of the axis line position which is made here in this method
@@ -1011,23 +1012,23 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub
if( fabs(fDeltaY) > fabs(fDeltaX) )
{
- m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_LEFT;
+ rAlignment.meAlignment = LABEL_ALIGN_LEFT;
//choose most left positions
::std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
- m_aAxisProperties.m_fLabelDirectionSign = fDeltaY<0 ? -1 : 1;
+ rAlignment.mfLabelDirection = (fDeltaY < 0) ? -1.0 : 1.0;
}
else
{
- m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_BOTTOM;
+ rAlignment.meAlignment = LABEL_ALIGN_BOTTOM;
//choose most bottom positions
::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
- m_aAxisProperties.m_fLabelDirectionSign = fDeltaX<0 ? -1 : 1;
+ rAlignment.mfLabelDirection = (fDeltaX < 0) ? -1.0 : 1.0;
}
ScreenPosAndLogicPos aBestPos( aPosList[0] );
fYStart = fYEnd = aBestPos.fLogicY;
fZStart = fZEnd = aBestPos.fLogicZ;
if( !m_pPosHelper->isMathematicalOrientationX() )
- m_aAxisProperties.m_fLabelDirectionSign *= -1;
+ rAlignment.mfLabelDirection *= -1.0;
}
}//end 3D x axis
}
@@ -1065,23 +1066,23 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub
if( fabs(fDeltaY) > fabs(fDeltaX) )
{
- m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_LEFT;
+ rAlignment.meAlignment = LABEL_ALIGN_LEFT;
//choose most left positions
::std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
- m_aAxisProperties.m_fLabelDirectionSign = fDeltaY<0 ? -1 : 1;
+ rAlignment.mfLabelDirection = (fDeltaY < 0) ? -1.0 : 1.0;
}
else
{
- m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_BOTTOM;
+ rAlignment.meAlignment = LABEL_ALIGN_BOTTOM;
//choose most bottom positions
::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
- m_aAxisProperties.m_fLabelDirectionSign = fDeltaX<0 ? -1 : 1;
+ rAlignment.mfLabelDirection = (fDeltaX < 0) ? -1.0 : 1.0;
}
ScreenPosAndLogicPos aBestPos( aPosList[0] );
fXStart = fXEnd = aBestPos.fLogicX;
fZStart = fZEnd = aBestPos.fLogicZ;
if( !m_pPosHelper->isMathematicalOrientationY() )
- m_aAxisProperties.m_fLabelDirectionSign *= -1;
+ rAlignment.mfLabelDirection *= -1.0;
}
}//end 3D y axis
}
@@ -1150,21 +1151,21 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub
if( !::rtl::math::approxEqual( fDeltaX, 0.0 ) ) // prefer left-right alignments
{
if( aBestPos.aScreenPos.getX() > aNotSoGoodPos.aScreenPos.getX() )
- m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_RIGHT;
+ rAlignment.meAlignment = LABEL_ALIGN_RIGHT;
else
- m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_LEFT;
+ rAlignment.meAlignment = LABEL_ALIGN_LEFT;
}
else
{
if( aBestPos.aScreenPos.getY() > aNotSoGoodPos.aScreenPos.getY() )
- m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_BOTTOM;
+ rAlignment.meAlignment = LABEL_ALIGN_BOTTOM;
else
- m_aAxisProperties.m_aLabelAlignment = LABEL_ALIGN_TOP;
+ rAlignment.meAlignment = LABEL_ALIGN_TOP;
}
- m_aAxisProperties.m_fLabelDirectionSign = fDeltaX<0 ? -1 : 1;
+ rAlignment.mfLabelDirection = (fDeltaX < 0) ? -1.0 : 1.0;
if( !m_pPosHelper->isMathematicalOrientationZ() )
- m_aAxisProperties.m_fLabelDirectionSign *= -1;
+ rAlignment.mfLabelDirection *= -1.0;
fXStart = fXEnd = aBestPos.fLogicX;
fYStart = fYEnd = aBestPos.fLogicY;
@@ -1176,7 +1177,7 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub
rEnd = getScreenPosition( fXEnd, fYEnd, fZEnd );
if(3==m_nDimension && !AxisHelper::isAxisPositioningEnabled() )
- m_aAxisProperties.m_fInnerDirectionSign = m_aAxisProperties.m_fLabelDirectionSign;//to behave like before
+ rAlignment.mfInnerTickDirection = rAlignment.mfLabelDirection;//to behave like before
if(3==m_nDimension && AxisHelper::isAxisPositioningEnabled() )
{
@@ -1187,54 +1188,54 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub
{
if( m_eLeftWallPos != CuboidPlanePosition_Left )
{
- m_aAxisProperties.m_fLabelDirectionSign *= -1.0;
- m_aAxisProperties.m_fInnerDirectionSign *= -1.0;
+ rAlignment.mfLabelDirection *= -1.0;
+ rAlignment.mfInnerTickDirection *= -1.0;
}
- m_aAxisProperties.m_aLabelAlignment =
- ( m_aAxisProperties.m_fLabelDirectionSign<0 ) ?
+ rAlignment.meAlignment =
+ (rAlignment.mfLabelDirection < 0) ?
LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT;
if( ( fDeltaY<0 && m_aScale.Orientation == chart2::AxisOrientation_REVERSE ) ||
( fDeltaY>0 && m_aScale.Orientation == chart2::AxisOrientation_MATHEMATICAL ) )
- m_aAxisProperties.m_aLabelAlignment =
- ( m_aAxisProperties.m_aLabelAlignment==LABEL_ALIGN_RIGHT ) ?
- LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT;
+ rAlignment.meAlignment =
+ (rAlignment.meAlignment == LABEL_ALIGN_RIGHT) ?
+ LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT;
}
else if( fabs(fDeltaY) > fabs(fDeltaX) )
{
if( m_eBackWallPos != CuboidPlanePosition_Back )
{
- m_aAxisProperties.m_fLabelDirectionSign *= -1.0;
- m_aAxisProperties.m_fInnerDirectionSign *= -1.0;
+ rAlignment.mfLabelDirection *= -1.0;
+ rAlignment.mfInnerTickDirection *= -1.0;
}
- m_aAxisProperties.m_aLabelAlignment =
- ( m_aAxisProperties.m_fLabelDirectionSign<0 ) ?
- LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT;
+ rAlignment.meAlignment =
+ (rAlignment.mfLabelDirection < 0) ?
+ LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT;
if( ( fDeltaY<0 && m_aScale.Orientation == chart2::AxisOrientation_REVERSE ) ||
( fDeltaY>0 && m_aScale.Orientation == chart2::AxisOrientation_MATHEMATICAL ) )
- m_aAxisProperties.m_aLabelAlignment =
- ( m_aAxisProperties.m_aLabelAlignment==LABEL_ALIGN_RIGHT ) ?
+ rAlignment.meAlignment =
+ (rAlignment.meAlignment == LABEL_ALIGN_RIGHT) ?
LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT;
}
else
{
if( m_eBackWallPos != CuboidPlanePosition_Back )
{
- m_aAxisProperties.m_fLabelDirectionSign *= -1.0;
- m_aAxisProperties.m_fInnerDirectionSign *= -1.0;
+ rAlignment.mfLabelDirection *= -1.0;
+ rAlignment.mfInnerTickDirection *= -1.0;
}
- m_aAxisProperties.m_aLabelAlignment =
- ( m_aAxisProperties.m_fLabelDirectionSign<0 ) ?
+ rAlignment.meAlignment =
+ (rAlignment.mfLabelDirection < 0) ?
LABEL_ALIGN_TOP : LABEL_ALIGN_BOTTOM;
if( ( fDeltaX>0 && m_aScale.Orientation == chart2::AxisOrientation_REVERSE ) ||
( fDeltaX<0 && m_aScale.Orientation == chart2::AxisOrientation_MATHEMATICAL ) )
- m_aAxisProperties.m_aLabelAlignment =
- ( m_aAxisProperties.m_aLabelAlignment==LABEL_ALIGN_TOP ) ?
+ rAlignment.meAlignment =
+ (rAlignment.meAlignment == LABEL_ALIGN_TOP) ?
LABEL_ALIGN_BOTTOM : LABEL_ALIGN_TOP;
}
}
@@ -1247,11 +1248,14 @@ TickFactory* VCartesianAxis::createTickFactory()
TickFactory2D* VCartesianAxis::createTickFactory2D()
{
+ AxisLabelAlignment aLabelAlign;
B2DVector aStart, aEnd;
- get2DAxisMainLine( aStart, aEnd, getAxisIntersectionValue() );
+ get2DAxisMainLine(aStart, aEnd, aLabelAlign, getAxisIntersectionValue());
+ m_aAxisProperties.maLabelAlignment = aLabelAlign;
B2DVector aLabelLineStart, aLabelLineEnd;
- get2DAxisMainLine( aLabelLineStart, aLabelLineEnd, getLabelLineIntersectionValue() );
+ get2DAxisMainLine(aLabelLineStart, aLabelLineEnd, aLabelAlign, getLabelLineIntersectionValue());
+ m_aAxisProperties.maLabelAlignment = aLabelAlign;
return new TickFactory2D( m_aScale, m_aIncrement, aStart, aEnd, aLabelLineStart-aStart );
}
@@ -1297,7 +1301,9 @@ sal_Int32 VCartesianAxis::estimateMaximumAutoMainIncrementCount()
return nRet;
B2DVector aStart, aEnd;
- this->get2DAxisMainLine( aStart, aEnd, getAxisIntersectionValue() );
+ AxisLabelAlignment aLabelAlign;
+ get2DAxisMainLine(aStart, aEnd, aLabelAlign, getAxisIntersectionValue());
+ m_aAxisProperties.maLabelAlignment = aLabelAlign;
sal_Int32 nMaxHeight = static_cast<sal_Int32>(fabs(aEnd.getY()-aStart.getY()));
sal_Int32 nMaxWidth = static_cast<sal_Int32>(fabs(aEnd.getX()-aStart.getX()));
@@ -1516,7 +1522,7 @@ void VCartesianAxis::updatePositions()
//correctPositionForRotation
LabelPositionHelper::correctPositionForRotation( xShape2DText
- , m_aAxisProperties.m_aLabelAlignment, fRotationAngleDegree, m_aAxisProperties.m_bComplexCategories );
+ , m_aAxisProperties.maLabelAlignment.meAlignment, fRotationAngleDegree, m_aAxisProperties.m_bComplexCategories );
}
}
}
@@ -1538,7 +1544,7 @@ void VCartesianAxis::createTickMarkLineShapes( TickInfoArrayType& rTickInfos, co
continue;
bool bTicksAtLabels = ( m_aAxisProperties.m_eTickmarkPos != ::com::sun::star::chart::ChartAxisMarkPosition_AT_AXIS );
- double fInnerDirectionSign = m_aAxisProperties.m_fInnerDirectionSign;
+ double fInnerDirectionSign = m_aAxisProperties.maLabelAlignment.mfInnerTickDirection;
if( bTicksAtLabels && m_aAxisProperties.m_eLabelPos == ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END )
fInnerDirectionSign *= -1.0;
bTicksAtLabels = bTicksAtLabels || bOnlyAtLabels;
@@ -1548,7 +1554,7 @@ void VCartesianAxis::createTickMarkLineShapes( TickInfoArrayType& rTickInfos, co
//add ticks at axis (without lables):
if( !bOnlyAtLabels && m_aAxisProperties.m_eTickmarkPos == ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS )
rTickFactory2D.addPointSequenceForTickLine( aPoints, nN++, (*aTickIter).fScaledTickValue
- , m_aAxisProperties.m_fInnerDirectionSign, rTickmarkProperties, !bTicksAtLabels );
+ , m_aAxisProperties.maLabelAlignment.mfInnerTickDirection, rTickmarkProperties, !bTicksAtLabels );
}
aPoints.realloc(nN);
m_pShapeFactory->createLine2D( m_xGroupShape_Shapes, aPoints
@@ -1641,7 +1647,9 @@ void VCartesianAxis::createShapes()
if (!rtl::math::isNan(fExtraLineCrossesOtherAxis))
{
B2DVector aStart, aEnd;
- this->get2DAxisMainLine( aStart, aEnd, fExtraLineCrossesOtherAxis );
+ AxisLabelAlignment aLabelAlign;
+ get2DAxisMainLine(aStart, aEnd, aLabelAlign, fExtraLineCrossesOtherAxis);
+ m_aAxisProperties.maLabelAlignment = aLabelAlign;
drawing::PointSequenceSequence aPoints( lcl_makePointSequence(aStart,aEnd) );
Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D(
m_xGroupShape_Shapes, aPoints, &m_aAxisProperties.m_aLineProperties );
diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx
index 0bbeb43..e3f26a8 100644
--- a/chart2/source/view/axes/VCartesianAxis.hxx
+++ b/chart2/source/view/axes/VCartesianAxis.hxx
@@ -71,7 +71,9 @@ public:
*/
double getExtraLineIntersectionValue() const;
- void get2DAxisMainLine( ::basegfx::B2DVector& rStart, ::basegfx::B2DVector& rEnd, double fCrossesOtherAxis );
+ void get2DAxisMainLine(
+ basegfx::B2DVector& rStart, basegfx::B2DVector& rEnd, AxisLabelAlignment& rLabelAlignment,
+ double fCrossesOtherAxis ) const;
//Layout interface for cartesian axes:
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index 6db58e8..f5d9992 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -35,10 +35,10 @@ VPolarRadiusAxis::VPolarRadiusAxis( const AxisProperties& rAxisProperties
, sal_Int32 nDimensionCount )
: VPolarAxis( rAxisProperties, xNumberFormatsSupplier, 1/*nDimensionIndex*/, nDimensionCount )
{
- m_aAxisProperties.m_fLabelDirectionSign=0.0;
- m_aAxisProperties.m_fInnerDirectionSign=0.0;
+ m_aAxisProperties.maLabelAlignment.mfLabelDirection = 0.0;
+ m_aAxisProperties.maLabelAlignment.mfInnerTickDirection = 0.0;
+ m_aAxisProperties.maLabelAlignment.meAlignment = LABEL_ALIGN_RIGHT;
m_aAxisProperties.m_bIsMainAxis=false;
- m_aAxisProperties.m_aLabelAlignment=LABEL_ALIGN_RIGHT;
m_aAxisProperties.init();
m_apAxisWithLabels.reset( new VCartesianAxis(
More information about the Libreoffice-commits
mailing list