[Libreoffice-commits] core.git: chart2/source

[xukai]

 chart2/source/view/charttypes/GL3DBarChart.cxx |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 35d4c21bf0faaffb87c5197f6d0b3d798aca33bd
Author: xukai <xukai at multicorewareinc.com>
Date:   Tue Sep 2 16:04:36 2014 +0800

    Update the color of FPS text
    
    Change-Id: Ic6f5889e24f98101426fc215c0313122797400b7
    Reviewed-on: https://gerrit.libreoffice.org/11507
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index d244c6f..0604f0e 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -1073,12 +1073,14 @@ void GL3DBarChart::updateRenderFPS()
         osl_getSystemTime(&maFPSRenderEndTime);
         nDeltaMs = calcTimeInterval(maFPSRenderStartTime, maFPSRenderEndTime);
         int iFPS = miFrameCount * 1000 / nDeltaMs;
-        maFPS = OUString("Render FPS: ") + OUString::number(iFPS);
+        maFPS =  OUString::number(iFPS);
         miFrameCount = 0;
         osl_getSystemTime(&maFPSRenderStartTime);
     }
     osl_getSystemTime(&maFPSRenderEndTime);
-    addScreenTextShape(maFPS, glm::vec2(-0.99f, 0.99f), 0.07f, true,
+    OUString aFPS = OUString("Render FPS: ");
+    addScreenTextShape(aFPS, glm::vec2(-0.77f, 0.99f), 0.07f, false, glm::vec4(0.0f, 1.0f, 1.0f, 0.0f));
+    addScreenTextShape(maFPS, glm::vec2(-0.77f, 0.99f), 0.07f, true,
                        glm::vec4(1.0f, 0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f));
 }
 
@@ -1113,18 +1115,20 @@ void GL3DBarChart::updateDataUpdateFPS()
         int iFPS = miDataUpdateCounter * 1000 / nDeltaMs;
         if (iFPS)
         {
-            maDataUpdateFPS = OUString("Data Update Rate: ") + OUString::number(iFPS);
+            maDataUpdateFPS = OUString::number(iFPS);
         }
         else
         {
             float fFPS = (float)miDataUpdateCounter * 1000 / (float)nDeltaMs;
-            maDataUpdateFPS = OUString("Data Update Rate: ") + OUString::number(fFPS);
+            maDataUpdateFPS = OUString::number(fFPS);
         }
         miDataUpdateCounter = 0;
         osl_getSystemTime(&maDataUpdateStartTime);
     }
     osl_getSystemTime(&maDataUpdateEndTime);
-    addScreenTextShape(maDataUpdateFPS, glm::vec2(-0.99f, 0.92f), 0.07f);
+    OUString aDataUpdateFPS = OUString("Data Update Rate: ");
+    addScreenTextShape(aDataUpdateFPS, glm::vec2(-0.77, 0.92f), 0.07f, false, glm::vec4(0.0f, 1.0f, 1.0f, 0.0f));
+    addScreenTextShape(maDataUpdateFPS, glm::vec2(-0.77f, 0.92f), 0.07f, true, glm::vec4(1.0f, 0.0f, 0.0f, 0.0f));
 }
 
 void GL3DBarChart::recordBarHistory(sal_uInt32 &nBarID, float &nVal)