Kaydet (Commit) 1b1dc3c9 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

Add legend name for polynomial and moving average trendlines.

Change-Id: I111c82c66f1ee29dae50470fc08bb66c79da0652
üst 1c5c2266
...@@ -57,6 +57,14 @@ String STR_REGRESSION_POWER ...@@ -57,6 +57,14 @@ String STR_REGRESSION_POWER
{ {
Text [ en-US ] = "Power (%SERIESNAME)" ; Text [ en-US ] = "Power (%SERIESNAME)" ;
}; };
String STR_REGRESSION_POLYNOMIAL
{
Text [ en-US ] = "Polynomial (%SERIESNAME)" ;
};
String STR_REGRESSION_MOVING_AVERAGE
{
Text [ en-US ] = "Moving average (%SERIESNAME)" ;
};
String STR_REGRESSION_MEAN String STR_REGRESSION_MEAN
{ {
......
...@@ -593,7 +593,7 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR ...@@ -593,7 +593,7 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
{ {
OUString aResult; OUString aResult;
Reference< lang::XServiceName > xServiceName( xRegressionCurve, uno::UNO_QUERY ); Reference< lang::XServiceName > xServiceName( xRegressionCurve, uno::UNO_QUERY );
if( ! xServiceName.is()) if(!xServiceName.is())
return aResult; return aResult;
OUString aServiceName( xServiceName->getServiceName()); OUString aServiceName( xServiceName->getServiceName());
...@@ -629,20 +629,19 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR ...@@ -629,20 +629,19 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
return aResult; return aResult;
} }
::std::vector< Reference< chart2::XRegressionCurve > > std::vector< Reference< chart2::XRegressionCurve > >
RegressionCurveHelper::getAllRegressionCurvesNotMeanValueLine( RegressionCurveHelper::getAllRegressionCurvesNotMeanValueLine(
const Reference< chart2::XDiagram > & xDiagram ) const Reference< chart2::XDiagram > & xDiagram )
{ {
::std::vector< Reference< chart2::XRegressionCurve > > aResult; std::vector< Reference< chart2::XRegressionCurve > > aResult;
::std::vector< Reference< chart2::XDataSeries > > aSeries( DiagramHelper::getDataSeriesFromDiagram( xDiagram )); std::vector< Reference< chart2::XDataSeries > > aSeries( DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeries.begin()); for( std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeries.begin());
aIt != aSeries.end(); ++aIt ) aIt != aSeries.end(); ++aIt )
{ {
Reference< chart2::XRegressionCurveContainer > xCurveCnt( *aIt, uno::UNO_QUERY ); Reference< chart2::XRegressionCurveContainer > xContainer( *aIt, uno::UNO_QUERY );
if( xCurveCnt.is()) if(xContainer.is())
{ {
uno::Sequence< uno::Reference< chart2::XRegressionCurve > > aCurves( uno::Sequence< uno::Reference< chart2::XRegressionCurve > > aCurves(xContainer->getRegressionCurves());
xCurveCnt->getRegressionCurves());
for( sal_Int32 i = 0; i < aCurves.getLength(); ++i ) for( sal_Int32 i = 0; i < aCurves.getLength(); ++i )
{ {
if( ! isMeanValueLine( aCurves[i] )) if( ! isMeanValueLine( aCurves[i] ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment