summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Francis <dennis.francis@collabora.co.uk>2017-08-21 13:59:41 +0530
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-28 21:02:52 +0200
commit03add51224dff65d2238832d3e1b8abfa5ebcc02 (patch)
treeff177e9a6fd0e593360a7aa0000de25e834be947
parent0d6550f0fee06732d663b9763e18231dad4e42c5 (diff)
tdf#62363: When pie chart sector is too small do "Outside" placement
...of its label when "Best fit" label placement setting is used. Change-Id: Id201d922505de0e134286f4772abe282bb0722bc Reviewed-on: https://gerrit.libreoffice.org/41572 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 8c8edfabdee656ac5a9a0b1106f90baf315f1dd4) Reviewed-on: https://gerrit.libreoffice.org/41621
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx12
1 files changed, 10 insertions, 2 deletions
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index de8a2375fe3c..b0361c743ae1 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -281,14 +281,23 @@ void PieChart::createTextLabelShape(
///the label position is allowed; the `createTextLabelShape` treats the
///`AVOID_OVERLAP` as if it was of `CENTER` type;
+ double nVal = rSeries.getYValue(nPointIndex);
//AVOID_OVERLAP is in fact "Best fit" in the UI.
bool bMovementAllowed = ( nLabelPlacement == css::chart::DataLabelPlacement::AVOID_OVERLAP );
if( bMovementAllowed )
+ {
// Use center for "Best fit" for now. In the future we
// may want to implement a real best fit algorithm.
// But center is good enough, and close to what Excel
// does.
- nLabelPlacement = css::chart::DataLabelPlacement::CENTER;
+
+ // Place the label outside if the sector is too small
+ // The threshold is set to 2%, but can be improved by making it a function of
+ // label width and radius too ?
+ double fFrac = fabs( nVal / rParam.mfLogicYSum );
+ nLabelPlacement = ( fFrac <= 0.02 ) ? css::chart::DataLabelPlacement::OUTSIDE :
+ css::chart::DataLabelPlacement::CENTER;
+ }
///for `OUTSIDE` (`INSIDE`) label placements an offset of 150 (-150), in the
///radius direction, is added to the final screen position of the label
@@ -347,7 +356,6 @@ void PieChart::createTextLabelShape(
sal_Int32 nTextMaximumFrameWidth = ceil(fTextMaximumFrameWidth);
///the text shape for the label is created
- double nVal = rSeries.getYValue(nPointIndex);
aPieLabelInfo.xTextShape = createDataLabel(
xTextTarget, rSeries, nPointIndex, nVal, rParam.mfLogicYSum,
aScreenPosition2D, eAlignment, 0, nTextMaximumFrameWidth);