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

fdo#72137 Allocate enough points in MovingAverageRegression calc.

Browse Source 
Change-Id: I9ae058cad678cdb86709a4e40e3d4bd47900d386
This commit is contained in:
Tomaž Vajngerl
2013-12-09 19:53:20 +01:00
parent b4b623c10c
commit f464bb21c8
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
chart2/source/view/charttypes/VSeriesPlotter.cxx
View File

@@ -997,20 +997,15 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries,
xProperties->getPropertyValue( "InterceptValue") >>= aInterceptValue; xProperties->getPropertyValue( "InterceptValue") >>= aInterceptValue;
} }
double fMinX;
double fMaxX;
double fChartMinX = m_pPosHelper->getLogicMinX(); double fChartMinX = m_pPosHelper->getLogicMinX();
double fChartMaxX = m_pPosHelper->getLogicMaxX(); double fChartMaxX = m_pPosHelper->getLogicMaxX();
double fMinX = fChartMinX;
double fMaxX = fChartMaxX;
double fPointScale = 1.0; double fPointScale = 1.0;
if( bAverageLine ) if( !bAverageLine )
{
fMinX = fChartMinX;
fMaxX = fChartMaxX;
}
else
{ {
rVDataSeries.getMinMaxXValue(fMinX, fMaxX); rVDataSeries.getMinMaxXValue(fMinX, fMaxX);
fMaxX += aExtrapolateForward; fMaxX += aExtrapolateForward;
@@ -1018,6 +1013,7 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries,
fPointScale = (fMaxX - fMinX) / (fChartMaxX - fChartMinX); fPointScale = (fMaxX - fMinX) / (fChartMaxX - fChartMinX);
} }
xCalculator->setRegressionProperties(aDegree, aForceIntercept, aInterceptValue, aPeriod); xCalculator->setRegressionProperties(aDegree, aForceIntercept, aInterceptValue, aPeriod);
xCalculator->recalculateRegression( rVDataSeries.getAllX(), rVDataSeries.getAllY() ); xCalculator->recalculateRegression( rVDataSeries.getAllX(), rVDataSeries.getAllY() );
sal_Int32 nPointCount = 100 * fPointScale; sal_Int32 nPointCount = 100 * fPointScale;
@@ -1025,15 +1021,6 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries,
if ( nPointCount < 2 ) if ( nPointCount < 2 )
nPointCount = 2; nPointCount = 2;
drawing::PolyPolygonShape3D aRegressionPoly;
aRegressionPoly.SequenceX.realloc(1);
aRegressionPoly.SequenceY.realloc(1);
aRegressionPoly.SequenceZ.realloc(1);
aRegressionPoly.SequenceX[0].realloc(nPointCount);
aRegressionPoly.SequenceY[0].realloc(nPointCount);
aRegressionPoly.SequenceZ[0].realloc(nPointCount);
sal_Int32 nRealPointCount=0;
std::vector< ExplicitScaleData > aScales( m_pPosHelper->getScales()); std::vector< ExplicitScaleData > aScales( m_pPosHelper->getScales());
uno::Reference< chart2::XScaling > xScalingX; uno::Reference< chart2::XScaling > xScalingX;
uno::Reference< chart2::XScaling > xScalingY; uno::Reference< chart2::XScaling > xScalingY;
@@ -1048,7 +1035,19 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries,
fMinX, fMaxX, nPointCount, fMinX, fMaxX, nPointCount,
xScalingX, xScalingY, bMaySkipPoints )); xScalingX, xScalingY, bMaySkipPoints ));
for(sal_Int32 nP=0; nP<aCalculatedPoints.getLength(); nP++) nPointCount = aCalculatedPoints.getLength();
drawing::PolyPolygonShape3D aRegressionPoly;
aRegressionPoly.SequenceX.realloc(1);
aRegressionPoly.SequenceY.realloc(1);
aRegressionPoly.SequenceZ.realloc(1);
aRegressionPoly.SequenceX[0].realloc(nPointCount);
aRegressionPoly.SequenceY[0].realloc(nPointCount);
aRegressionPoly.SequenceZ[0].realloc(nPointCount);
sal_Int32 nRealPointCount = 0;
for(sal_Int32 nP = 0; nP < aCalculatedPoints.getLength(); ++nP)
{ {
double fLogicX = aCalculatedPoints[nP].X; double fLogicX = aCalculatedPoints[nP].X;
double fLogicY = aCalculatedPoints[nP].Y; double fLogicY = aCalculatedPoints[nP].Y;