diff options
| author | weigao <weigao@multicorewareinc.com> | 2014-08-07 14:25:50 +0800 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-06 20:45:13 +0200 |
| commit | 8f38b9e11eef43fbc47827eff432b3620aeee2d4 (patch) | |
| tree | c531cf5454963ce7266166f159ed11a4264c8278 /chart2 | |
| parent | b2b57d51b17704e1f7d031bda7d1549368838652 (diff) | |
remove test code of screen text
Change-Id: Ibcda49dc561b2778d17c03edaaaf2b8e2fff4a0a
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 12 | ||||
| -rw-r--r-- | chart2/source/view/inc/GL3DBarChart.hxx | 1 |
2 files changed, 1 insertions, 12 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 186bbacb7f03..1eed3cba48f9 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -377,16 +377,7 @@ void RenderBenchMarkThread::UpdateFPS() osl_getSystemTime(&mafpsRenderStartTime); } osl_getSystemTime(&mafpsRenderEndTime); -#if 1 - opengl3D::ScreenText tFPS(mpChart->mpRenderer.get(), *(mpChart->mpTextCache), mpChart->mTestString, 0); - opengl3D::TextCacheItem tmpTextCache = mpChart->mpTextCache->getText(mpChart->mTestString); -#else - opengl3D::ScreenText tFPS(mpChart->mpRenderer.get(), *(mpChart->mpTextCache), maFPS, 0); - opengl3D::TextCacheItem tmpTextCache = mpChart->mpTextCache->getText(maFPS); -#endif - float rectWidth = (float)tmpTextCache.maSize.Width() / (float)tmpTextCache.maSize.Height() * 0.05; - tFPS.setPosition(glm::vec2(-0.99f, 0.99f), glm::vec2(-0.99f + rectWidth, 0.89f)); - tFPS.render(); + //will add the fps render code here later } void RenderBenchMarkThread::UpdateScreenText() @@ -648,7 +639,6 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer maShapes.push_back(new opengl3D::Text(mpRenderer.get(), *mpTextCache, aCats[i], nId)); - mTestString = aCats[i]; nId += ID_STEP; p = static_cast<opengl3D::Text*>(&maShapes.back()); aTopLeft.x = nXPos + TEXT_HEIGHT + 0.5 * BAR_SIZE_X; diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index a4a92a4d680c..7b1e7b6d6c8c 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -137,7 +137,6 @@ private: RenderEventType maRenderEvent; sal_uInt32 mSelectBarId; Point maClickPos; - OUString mTestString; sal_uInt32 miScrollRate; bool mbScrollFlg; }; |