[Libreoffice-commits] core.git: Branch 'private/moggi/fix-opengl-backend' - 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 171a0e95720abf26a87a9ca0243747d754204830
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jan 1 22:13:43 2014 +0100

    add more debug output
    
    Change-Id: Ib9454f6fec6988899161e59c066fcc384e286200

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index a204334..2fe8e79 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -378,7 +378,8 @@ DummyCircle::DummyCircle(const awt::Point& rPos, const awt::Size& rSize)
 void DummyCircle::render()
 {
     debugProperties(maProperties);
-    std::map<OUString, uno::Any> itr = maProperties.find("FillColor");
+    DummyChart* pChart = getRootShape();
+    std::map<OUString, uno::Any>::const_iterator itr = maProperties.find("FillColor");
     if(itr != maProperties.end())
     {
         sal_Int32 nColor = itr->second.get<sal_Int32>();
@@ -386,10 +387,10 @@ void DummyCircle::render()
     }
     else
         SAL_WARN("chart2.opengl", "missing color");
-    long color = 0x3465AF;
-    DummyChart* pChart = getRootShape();
     pChart->m_GLRender.Bubble2DShapePoint(maPosition.X, maPosition.Y,
                                           maSize.Width, maSize.Height);
+    SAL_WARN("chart2.opengl", "Bubble Position: " << maPosition.X << "," << maPosition.Y);
+    SAL_WARN("chart2.opengl", "Bubble Size: " << maSize.Width << "," << maSize.Height);
     pChart->m_GLRender.RenderBubble2FBO(GL_TRUE);
 }
 
commit 2a469263354d9cff3d8101f0f41bee34a616960a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jan 1 22:10:17 2014 +0100

    add color to bubbles
    
    Change-Id: Id851916a160b65360ee0dd4bbe67b5246067b659

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 3b714e9..a204334 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -378,9 +378,16 @@ DummyCircle::DummyCircle(const awt::Point& rPos, const awt::Size& rSize)
 void DummyCircle::render()
 {
     debugProperties(maProperties);
+    std::map<OUString, uno::Any> itr = maProperties.find("FillColor");
+    if(itr != maProperties.end())
+    {
+        sal_Int32 nColor = itr->second.get<sal_Int32>();
+        pChart->m_GLRender.SetColor(nColor);
+    }
+    else
+        SAL_WARN("chart2.opengl", "missing color");
     long color = 0x3465AF;
     DummyChart* pChart = getRootShape();
-    pChart->m_GLRender.SetColor(color);
     pChart->m_GLRender.Bubble2DShapePoint(maPosition.X, maPosition.Y,
                                           maSize.Width, maSize.Height);
     pChart->m_GLRender.RenderBubble2FBO(GL_TRUE);