diff options
| author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2016-03-31 23:15:28 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-04-02 18:56:19 +0000 |
| commit | a0b1a10ddcf5e17116055a0c82200231bf5cd55f (patch) | |
| tree | 22556660e96dcc13ce19df82b803e614bc807a21 /chart2/qa | |
| parent | 0b5a02eeaa50ffe77d18374162b984a36e69c6cf (diff) | |
Chart: Improve polynomial trendline equation rendering
Convert power figures in supersript figures
Replace minus sign
Change-Id: Ia0e77b5de3b6f2368efd1315576f9709d7b1b2d9
Reviewed-on: https://gerrit.libreoffice.org/23714
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'chart2/qa')
| -rw-r--r-- | chart2/qa/extras/chart2_trendcalculators.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx b/chart2/qa/extras/chart2_trendcalculators.cxx index 0fd3c1d27fb7..0c3b972c3031 100644 --- a/chart2/qa/extras/chart2_trendcalculators.cxx +++ b/chart2/qa/extras/chart2_trendcalculators.cxx @@ -10,6 +10,8 @@ #include "charttest.hxx" #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> +#include <SpecialUnicodes.hxx> + // Define the index of sheets in the test document #define SHEET_POTENTIAL1 0 @@ -150,7 +152,7 @@ void Chart2TrendCalculators::testLinearRegression1() xValues[i] = d; yValues[i] = - 2.0 * d - 5.0 ; } - checkCalculator( xValues, yValues, "f(x) = - 2x - 5"); + checkCalculator( xValues, yValues, "f(x) = "+ aMinusSign +" 2x "+ aMinusSign +" 5"); } // test y = A x ^ B @@ -166,7 +168,8 @@ void Chart2TrendCalculators::testPolynomialRegression1() xValues[i] = d; yValues[i] = - 2.0 * d * d + 4 * d - 5; } - checkCalculator( xValues, yValues, "f(x) = - 2x^2 + 4x - 5"); + OUString sExpectedFormula( "f(x) = "+ aMinusSign +" 2x" + OUString( aSuperscriptFigures[2] ) + " + 4x "+ aMinusSign +" 5" ); + checkCalculator( xValues, yValues, sExpectedFormula ); } void Chart2TrendCalculators::testExponentialRegression1() |