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
76fa5481
Kaydet (Commit)
76fa5481
authored
Agu 09, 2014
tarafından
weigao
Kaydeden (comit)
Markus Mohrhard
Agu 13, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
add function of adding screen text shape
Change-Id: I0f40081a0855bc8e43a8d4761222bd351b5d6f0c
üst
212dfdbb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
GL3DBarChart.cxx
chart2/source/view/charttypes/GL3DBarChart.cxx
+10
-5
GL3DBarChart.hxx
chart2/source/view/inc/GL3DBarChart.hxx
+1
-0
No files found.
chart2/source/view/charttypes/GL3DBarChart.cxx
Dosyayı görüntüle @
76fa5481
...
@@ -912,6 +912,15 @@ void GL3DBarChart::contextDestroyed()
...
@@ -912,6 +912,15 @@ void GL3DBarChart::contextDestroyed()
mbValidContext
=
false
;
mbValidContext
=
false
;
}
}
void
GL3DBarChart
::
addScreenTextShape
(
OUString
&
nStr
,
glm
::
vec2
rLeftTop
,
float
nTextHeight
,
glm
::
vec3
rPos
)
{
maScreenTextShapes
.
push_back
(
new
opengl3D
::
ScreenText
(
mpRenderer
.
get
(),
*
mpTextCache
,
nStr
,
0
));
opengl3D
::
TextCacheItem
tmpTextCache
=
mpTextCache
->
getText
(
nStr
);
float
rectWidth
=
(
float
)
tmpTextCache
.
maSize
.
Width
()
/
(
float
)
tmpTextCache
.
maSize
.
Height
()
*
0.05
;
opengl3D
::
ScreenText
*
pScreenText
=
static_cast
<
opengl3D
::
ScreenText
*>
(
&
maScreenTextShapes
.
back
());
pScreenText
->
setPosition
(
rLeftTop
,
glm
::
vec2
(
rLeftTop
.
x
+
rectWidth
,
rLeftTop
.
y
-
nTextHeight
),
rPos
);
}
void
GL3DBarChart
::
updateRenderFPS
()
void
GL3DBarChart
::
updateRenderFPS
()
{
{
int
aDeltaMs
=
calcTimeInterval
(
mafpsRenderStartTime
,
mafpsRenderEndTime
);
int
aDeltaMs
=
calcTimeInterval
(
mafpsRenderStartTime
,
mafpsRenderEndTime
);
...
@@ -925,11 +934,7 @@ void GL3DBarChart::updateRenderFPS()
...
@@ -925,11 +934,7 @@ void GL3DBarChart::updateRenderFPS()
osl_getSystemTime
(
&
mafpsRenderStartTime
);
osl_getSystemTime
(
&
mafpsRenderStartTime
);
}
}
osl_getSystemTime
(
&
mafpsRenderEndTime
);
osl_getSystemTime
(
&
mafpsRenderEndTime
);
maScreenTextShapes
.
push_back
(
new
opengl3D
::
ScreenText
(
mpRenderer
.
get
(),
*
mpTextCache
,
maFPS
,
0
));
addScreenTextShape
(
maFPS
,
glm
::
vec2
(
-
0.99
f
,
0.99
f
),
0.1
f
,
glm
::
vec3
(
0.0
,
0.0
,
0.0
));
opengl3D
::
TextCacheItem
tmpTextCache
=
mpTextCache
->
getText
(
maFPS
);
float
rectWidth
=
(
float
)
tmpTextCache
.
maSize
.
Width
()
/
(
float
)
tmpTextCache
.
maSize
.
Height
()
*
0.05
;
opengl3D
::
ScreenText
*
pScreenText
=
static_cast
<
opengl3D
::
ScreenText
*>
(
&
maScreenTextShapes
.
back
());
pScreenText
->
setPosition
(
glm
::
vec2
(
-
0.99
f
,
0.99
f
),
glm
::
vec2
(
-
0.99
f
+
rectWidth
,
0.89
f
));
}
}
int
GL3DBarChart
::
calcTimeInterval
(
TimeValue
&
startTime
,
TimeValue
&
endTime
)
int
GL3DBarChart
::
calcTimeInterval
(
TimeValue
&
startTime
,
TimeValue
&
endTime
)
...
...
chart2/source/view/inc/GL3DBarChart.hxx
Dosyayı görüntüle @
76fa5481
...
@@ -90,6 +90,7 @@ private:
...
@@ -90,6 +90,7 @@ private:
void
updateRenderFPS
();
void
updateRenderFPS
();
DECL_LINK
(
updateTimer
,
void
*
);
DECL_LINK
(
updateTimer
,
void
*
);
int
calcTimeInterval
(
TimeValue
&
startTime
,
TimeValue
&
endTime
);
int
calcTimeInterval
(
TimeValue
&
startTime
,
TimeValue
&
endTime
);
void
addScreenTextShape
(
OUString
&
nStr
,
glm
::
vec2
rLeftTop
,
float
nTextHeight
,
glm
::
vec3
rPos
);
css
::
uno
::
Reference
<
css
::
chart2
::
XChartType
>
mxChartType
;
css
::
uno
::
Reference
<
css
::
chart2
::
XChartType
>
mxChartType
;
boost
::
ptr_vector
<
opengl3D
::
Renderable3DObject
>
maShapes
;
boost
::
ptr_vector
<
opengl3D
::
Renderable3DObject
>
maShapes
;
...
...
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