[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx  |    3 ++-
 chart2/source/view/main/OpenGLRender.cxx |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 19eadfeb49899e683e7c3adf6b64d08b6e6200d7
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Jan 22 06:01:31 2014 +0100

    improve pie segment rendering
    
    Change-Id: I57c213420718f2be338b94459c6273fbfcb32881

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index e6072c5..9421a16 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -370,7 +370,8 @@ void DummyPieSegment2D::render()
     */
 
     float nSize = std::max<float>(maUnitCircleToScene.Line1.Column1, maUnitCircleToScene.Line2.Column2);
-    pChart->m_GLRender.RenderPieSegment2DShape(nSize, maUnitCircleToScene.Line1.Column4, maUnitCircleToScene.Line2.Column4);
+    pChart->m_GLRender.RenderPieSegment2DShape(nSize, maUnitCircleToScene.Line1.Column4 + maOffset.DirectionX,
+            maUnitCircleToScene.Line2.Column4 + maOffset.DirectionY);
 
 }
 
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 35f33e4..e570a9e 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1737,6 +1737,7 @@ void OpenGLRender::GeneratePieSegment2D(double fInnerRadius, double fOutterRadiu
     if(bInnerRadiusNotZero)
         nVectorSize *= 2;
 
+    nAngleStart += 90;
     aPointList.reserve(nVectorSize);
     // if inner radius = 0 generate a normal pie segment (triangle fan)
     // if inner radius != 0 generate a pie segment - inner pie (triangle strip)