diff options
author | xukai <xukai@multicorewareinc.com> | 2014-09-02 16:04:36 +0800 |
---|---|---|
committer | Kohei Yoshida <libreoffice@kohei.us> | 2014-09-23 14:58:01 +0000 |
commit | 35d4c21bf0faaffb87c5197f6d0b3d798aca33bd (patch) | |
tree | d04878afaf74b4d03ab80f328032efef318c17dd /chart2 | |
parent | 221c2eb24b5eeeadb265cfd010fd6851715b24b5 (diff) |
Update the color of FPS text
Change-Id: Ic6f5889e24f98101426fc215c0313122797400b7
Reviewed-on: https://gerrit.libreoffice.org/11507
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index d244c6f26e21..0604f0e95dce 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) |