Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
5ae77e8f
Kaydet (Commit)
5ae77e8f
authored
May 07, 2014
tarafından
Markus Mohrhard
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
provide bar color for 3D OGL chart
Change-Id: Ia41748cabba89a0257c62f66a280810adc56960e
üst
46443966
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
GL3DBarChart.cxx
chart2/source/view/charttypes/GL3DBarChart.cxx
+5
-1
3DChartObjects.hxx
chart2/source/view/inc/3DChartObjects.hxx
+1
-1
3DChartObjects.cxx
chart2/source/view/main/3DChartObjects.cxx
+2
-1
No files found.
chart2/source/view/charttypes/GL3DBarChart.cxx
Dosyayı görüntüle @
5ae77e8f
...
@@ -17,6 +17,8 @@
...
@@ -17,6 +17,8 @@
#include "3DChartObjects.hxx"
#include "3DChartObjects.hxx"
#include "GL3DRenderer.hxx"
#include "GL3DRenderer.hxx"
using
namespace
com
::
sun
::
star
;
namespace
chart
{
namespace
chart
{
GL3DBarChart
::
GL3DBarChart
(
const
std
::
vector
<
VDataSeries
*>&
rDataSeries
,
GL3DBarChart
::
GL3DBarChart
(
const
std
::
vector
<
VDataSeries
*>&
rDataSeries
,
...
@@ -53,11 +55,13 @@ void GL3DBarChart::create3DShapes()
...
@@ -53,11 +55,13 @@ void GL3DBarChart::create3DShapes()
float
nXPos
=
nIndex
*
(
nBarSizeX
+
nBarDistanceX
);
float
nXPos
=
nIndex
*
(
nBarSizeX
+
nBarDistanceX
);
float
nYPos
=
nSeriesIndex
*
(
nBarSizeY
+
nBarDistanceY
);
float
nYPos
=
nSeriesIndex
*
(
nBarSizeY
+
nBarDistanceY
);
sal_Int32
nColor
=
COL_BLUE
;
glm
::
mat4
aBarPosition
;
glm
::
mat4
aBarPosition
;
aBarPosition
=
glm
::
scale
(
aBarPosition
,
nBarSizeX
,
nBarSizeY
,
nVal
);
aBarPosition
=
glm
::
scale
(
aBarPosition
,
nBarSizeX
,
nBarSizeY
,
nVal
);
aBarPosition
=
glm
::
translate
(
aBarPosition
,
nXPos
,
nYPos
,
nVal
/
2
);
aBarPosition
=
glm
::
translate
(
aBarPosition
,
nXPos
,
nYPos
,
nVal
/
2
);
maShapes
.
push_back
(
new
opengl3D
::
Bar
(
mpRenderer
.
get
(),
aBarPosition
,
nId
++
));
maShapes
.
push_back
(
new
opengl3D
::
Bar
(
mpRenderer
.
get
(),
aBarPosition
,
n
Color
,
n
Id
++
));
}
}
++
nSeriesIndex
;
++
nSeriesIndex
;
...
...
chart2/source/view/inc/3DChartObjects.hxx
Dosyayı görüntüle @
5ae77e8f
...
@@ -37,7 +37,7 @@ protected:
...
@@ -37,7 +37,7 @@ protected:
class
Bar
:
public
Renderable3DObject
class
Bar
:
public
Renderable3DObject
{
{
public
:
public
:
Bar
(
OpenGL3DRenderer
*
pRenderer
,
const
glm
::
mat4
&
rPosition
,
sal_uInt32
nId
);
Bar
(
OpenGL3DRenderer
*
pRenderer
,
const
glm
::
mat4
&
rPosition
,
sal_
Int32
nColor
,
sal_
uInt32
nId
);
virtual
void
render
()
SAL_OVERRIDE
;
virtual
void
render
()
SAL_OVERRIDE
;
private
:
private
:
...
...
chart2/source/view/main/3DChartObjects.cxx
Dosyayı görüntüle @
5ae77e8f
...
@@ -24,10 +24,11 @@ void Renderable3DObject::render()
...
@@ -24,10 +24,11 @@ void Renderable3DObject::render()
(
void
)
mnUniqueId
;
(
void
)
mnUniqueId
;
}
}
Bar
::
Bar
(
OpenGL3DRenderer
*
pRenderer
,
const
glm
::
mat4
&
rPosition
,
sal_uInt32
nId
)
Bar
::
Bar
(
OpenGL3DRenderer
*
pRenderer
,
const
glm
::
mat4
&
rPosition
,
sal_
Int32
aColor
,
sal_
uInt32
nId
)
:
Renderable3DObject
(
pRenderer
,
nId
)
:
Renderable3DObject
(
pRenderer
,
nId
)
,
mbRoundedCorners
(
false
)
,
mbRoundedCorners
(
false
)
,
maPos
(
rPosition
)
,
maPos
(
rPosition
)
,
maColor
(
aColor
)
{
{
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment