diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-04-10 11:45:20 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-04-10 11:47:08 -0400 |
commit | b49e42f358bc37c77824028ffadc6f51b9d12172 (patch) | |
tree | 96d354f6ec3112cf2b68e7e3a874cd36b8eee24f | |
parent | 085ab6263e470f81030c626b814698589ceaf8e8 (diff) |
Rename 3DBarChart and Bar3DChart to GL3DBarChart.
Change-Id: If0449e00549d8e2f4a8cfac325a5f8c5e4ea3dcd
-rw-r--r-- | chart2/Library_chartcore.mk | 2 | ||||
-rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx (renamed from chart2/source/view/charttypes/3DBarChart.cxx) | 12 | ||||
-rw-r--r-- | chart2/source/view/inc/GL3DBarChart.hxx (renamed from chart2/source/view/inc/3DBarChart.hxx) | 11 | ||||
-rw-r--r-- | chart2/source/view/main/ChartView.cxx | 4 |
4 files changed, 17 insertions, 12 deletions
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 7851bd5b55c1..af3b6f3b67e1 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -86,7 +86,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/view/axes/VPolarCoordinateSystem \ chart2/source/view/axes/VPolarGrid \ chart2/source/view/axes/VPolarRadiusAxis \ - chart2/source/view/charttypes/3DBarChart \ + chart2/source/view/charttypes/GL3DBarChart \ chart2/source/view/charttypes/AreaChart \ chart2/source/view/charttypes/BarChart \ chart2/source/view/charttypes/BarPositionHelper \ diff --git a/chart2/source/view/charttypes/3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 68f612c14439..160f40eaa143 100644 --- a/chart2/source/view/charttypes/3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -7,9 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <GL/glew.h> +#include <GL3DBarChart.hxx> -#include "3DBarChart.hxx" +#include <GL/glew.h> #include <glm/glm.hpp> #include <glm/gtx/transform.hpp> @@ -18,17 +18,17 @@ namespace chart { -Bar3DChart::Bar3DChart(const std::vector<VDataSeries*>& rDataSeries): +GL3DBarChart::GL3DBarChart(const std::vector<VDataSeries*>& rDataSeries): maDataSeries(rDataSeries), mxContext(new opengl3D::temporary::TemporaryContext()) { } -Bar3DChart::~Bar3DChart() +GL3DBarChart::~GL3DBarChart() { } -void Bar3DChart::create3DShapes() +void GL3DBarChart::create3DShapes() { const float nBarSizeX = 10; const float nBarSizeY = 10; @@ -61,7 +61,7 @@ void Bar3DChart::create3DShapes() } } -void Bar3DChart::render() +void GL3DBarChart::render() { mxContext->init(); for(boost::ptr_vector<opengl3D::Renderable3DObject>::iterator itr = maShapes.begin(), diff --git a/chart2/source/view/inc/3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index 2f10ce26d41f..6191fc17c5a2 100644 --- a/chart2/source/view/inc/3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -7,6 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef CHART2_GL3DBARCHART_HXX +#define CHART2_GL3DBARCHART_HXX + #include <vector> #include <boost/ptr_container/ptr_vector.hpp> #include "VDataSeries.hxx" @@ -25,11 +28,11 @@ class TemporaryContext; } } -class Bar3DChart +class GL3DBarChart { public: - Bar3DChart(const std::vector<VDataSeries*>& rDataSeries); - ~Bar3DChart(); + GL3DBarChart(const std::vector<VDataSeries*>& rDataSeries); + ~GL3DBarChart(); void create3DShapes(); @@ -45,4 +48,6 @@ private: } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index cd60243d384c..da0e30a34e4b 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -48,7 +48,7 @@ #include "DateHelper.hxx" #include "defines.hxx" #include <unonames.hxx> -#include "3DBarChart.hxx" +#include <GL3DBarChart.hxx> #include <rtl/uuid.h> #include <comphelper/scopeguard.hxx> @@ -3149,7 +3149,7 @@ void ChartView::createShapes3D() } } - Bar3DChart aBarChart(aDataSeries); + GL3DBarChart aBarChart(aDataSeries); aBarChart.create3DShapes(); aBarChart.render(); } |