mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#114821 calculate better label position

Browse Source 
Positioning hack was improved. It calculates position
depending on direct chart size factor. Preffered
label positions are: top - vertical, and center - horizontal

Change-Id: Ic25f08cd0bc3105fe34841dbc3f8aacacb694d43
Reviewed-on: https://gerrit.libreoffice.org/48909
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
This commit is contained in:
Szymon Kłos
2018-01-03 13:24:32 +01:00
parent 65de542369
commit 002b65c579
3 changed files with 73 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
oox/source/drawingml/chart/seriesconverter.cxx
View File

@@ -63,13 +63,30 @@ using namespace ::com::sun::star::uno;
namespace {
/** nested-up sgn function - employs some gratuity around 0 - values
smaller than 0.33 are clamped to 0
/** Function to get vertical position of label from chart height factor.
Value can be negative, prefer top placement.
*/
int lclSgn( double nVal )
int lclGetPositionY( double nVal )
{
const int intVal=nVal*3;
return intVal == 0 ? 0 : (intVal < 0 ? -1 : 1);
if( nVal <= 0.1 )
return -1;
else if( nVal <= 0.6 )
return 0;
else
return 1;
}
/** Function to get horizontal position of label from chart width factor.
Value can be negative, prefer center placement.
*/
int lclGetPositionX( double nVal )
{
if( nVal <= -0.2 )
return -1;
else if( nVal <= 0.2 )
return 0;
else
return 1;
}
Reference< XLabeledDataSequence > lclCreateLabeledDataSequence(
@@ -259,11 +276,8 @@ void DataLabelConverter::convertFromModel( const Reference< XDataSeries >& rxDat
csscd::LEFT, csscd::CENTER, csscd::RIGHT,
csscd::BOTTOM_LEFT, csscd::BOTTOM, csscd::BOTTOM_RIGHT
};
const double nMax=std::max(
fabs(mrModel.mxLayout->mfX),
fabs(mrModel.mxLayout->mfY));
const int simplifiedX=lclSgn(mrModel.mxLayout->mfX/nMax);
const int simplifiedY=lclSgn(mrModel.mxLayout->mfY/nMax);
const int simplifiedX = lclGetPositionX(mrModel.mxLayout->mfX);
const int simplifiedY = lclGetPositionY(mrModel.mxLayout->mfY);
aPropSet.setProperty( PROP_LabelPlacement,
aPositionsLookupTable[ simplifiedX+1 + 3*(simplifiedY+1) ] );
}

BIN
sd/qa/unit/data/pptx/tdf114821.pptx Normal file
View File

Binary file not shown.

49
sd/qa/unit/import-tests.cxx
View File

@@ -56,6 +56,7 @@
#include <com/sun/star/animations/XAnimationNode.hpp>
#include <com/sun/star/animations/XAnimate.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart/DataLabelPlacement.hpp>
#include <com/sun/star/chart/XChartDocument.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
@@ -172,6 +173,7 @@ public:
void testTdf90626();
void testTdf114488();
void testTdf114913();
void testTdf114821();
bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber, std::vector<sal_uInt8>& rExpected);
void testPatternImport();
@@ -248,6 +250,7 @@ public:
CPPUNIT_TEST(testTdf90626);
CPPUNIT_TEST(testTdf114488);
CPPUNIT_TEST(testTdf114913);
CPPUNIT_TEST(testTdf114821);
CPPUNIT_TEST_SUITE_END();
};
@@ -2330,6 +2333,52 @@ void SdImportTest::testTdf114913()
xDocShRef->DoClose();
}
void SdImportTest::testTdf114821()
{
css::uno::Any aAny;
sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( "/sd/qa/unit/data/pptx/tdf114821.pptx" ), PPTX );
uno::Reference< beans::XPropertySet > xPropSet( getShapeFromPage( 0, 0, xDocShRef ) );
aAny = xPropSet->getPropertyValue( "Model" );
CPPUNIT_ASSERT_MESSAGE( "The shape doesn't have the property", aAny.hasValue() );
uno::Reference< chart::XChartDocument > xChartDoc;
aAny >>= xChartDoc;
CPPUNIT_ASSERT_MESSAGE( "failed to load chart", xChartDoc.is() );
uno::Reference< chart2::XChartDocument > xChart2Doc( xChartDoc, uno::UNO_QUERY );
CPPUNIT_ASSERT_MESSAGE( "failed to load chart", xChart2Doc.is() );
uno::Reference< chart2::XCoordinateSystemContainer > xBCooSysCnt( xChart2Doc->getFirstDiagram(), uno::UNO_QUERY );
uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysSeq( xBCooSysCnt->getCoordinateSystems() );
uno::Reference< chart2::XChartTypeContainer > xCTCnt( aCooSysSeq[0], uno::UNO_QUERY );
uno::Reference< chart2::XDataSeriesContainer > xDSCnt( xCTCnt->getChartTypes()[0], uno::UNO_QUERY );
CPPUNIT_ASSERT_MESSAGE( "failed to load data series", xDSCnt.is() );
uno::Sequence< uno::Reference< chart2::XDataSeries > > aSeriesSeq( xDSCnt->getDataSeries() );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Invalid Series count", static_cast<sal_Int32>( 1 ), aSeriesSeq.getLength() );
// Check the first label
const css::uno::Reference< css::beans::XPropertySet >& rPropSet0( aSeriesSeq[0]->getDataPointByIndex( 0 ) );
CPPUNIT_ASSERT( rPropSet0.is() );
sal_Int32 aPlacement;
rPropSet0->getPropertyValue( "LabelPlacement" ) >>= aPlacement;
CPPUNIT_ASSERT_EQUAL( css::chart::DataLabelPlacement::TOP, aPlacement );
// Check the second label
const css::uno::Reference< css::beans::XPropertySet >& rPropSet1( aSeriesSeq[0]->getDataPointByIndex( 1 ) );
CPPUNIT_ASSERT( rPropSet1.is() );
rPropSet1->getPropertyValue( "LabelPlacement" ) >>= aPlacement;
CPPUNIT_ASSERT_EQUAL( css::chart::DataLabelPlacement::CENTER, aPlacement );
// Check the third label
const css::uno::Reference< css::beans::XPropertySet >& rPropSet2( aSeriesSeq[0]->getDataPointByIndex( 2 ) );
CPPUNIT_ASSERT( rPropSet2.is() );
rPropSet2->getPropertyValue( "LabelPlacement") >>= aPlacement;
CPPUNIT_ASSERT_EQUAL( css::chart::DataLabelPlacement::TOP, aPlacement );
xDocShRef->DoClose();
}
CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();