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
8f38b9e1
Kaydet (Commit)
8f38b9e1
authored
Agu 07, 2014
tarafından
weigao
Kaydeden (comit)
Markus Mohrhard
Agu 06, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
remove test code of screen text
Change-Id: Ibcda49dc561b2778d17c03edaaaf2b8e2fff4a0a
üst
b2b57d51
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
12 deletions
+1
-12
GL3DBarChart.cxx
chart2/source/view/charttypes/GL3DBarChart.cxx
+1
-11
GL3DBarChart.hxx
chart2/source/view/inc/GL3DBarChart.hxx
+0
-1
No files found.
chart2/source/view/charttypes/GL3DBarChart.cxx
Dosyayı görüntüle @
8f38b9e1
...
@@ -377,16 +377,7 @@ void RenderBenchMarkThread::UpdateFPS()
...
@@ -377,16 +377,7 @@ void RenderBenchMarkThread::UpdateFPS()
osl_getSystemTime
(
&
mafpsRenderStartTime
);
osl_getSystemTime
(
&
mafpsRenderStartTime
);
}
}
osl_getSystemTime
(
&
mafpsRenderEndTime
);
osl_getSystemTime
(
&
mafpsRenderEndTime
);
#if 1
//will add the fps render code here later
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.99
f
,
0.99
f
),
glm
::
vec2
(
-
0.99
f
+
rectWidth
,
0.89
f
));
tFPS
.
render
();
}
}
void
RenderBenchMarkThread
::
UpdateScreenText
()
void
RenderBenchMarkThread
::
UpdateScreenText
()
...
@@ -648,7 +639,6 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer
...
@@ -648,7 +639,6 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer
maShapes
.
push_back
(
new
opengl3D
::
Text
(
mpRenderer
.
get
(),
*
mpTextCache
,
maShapes
.
push_back
(
new
opengl3D
::
Text
(
mpRenderer
.
get
(),
*
mpTextCache
,
aCats
[
i
],
nId
));
aCats
[
i
],
nId
));
mTestString
=
aCats
[
i
];
nId
+=
ID_STEP
;
nId
+=
ID_STEP
;
p
=
static_cast
<
opengl3D
::
Text
*>
(
&
maShapes
.
back
());
p
=
static_cast
<
opengl3D
::
Text
*>
(
&
maShapes
.
back
());
aTopLeft
.
x
=
nXPos
+
TEXT_HEIGHT
+
0.5
*
BAR_SIZE_X
;
aTopLeft
.
x
=
nXPos
+
TEXT_HEIGHT
+
0.5
*
BAR_SIZE_X
;
...
...
chart2/source/view/inc/GL3DBarChart.hxx
Dosyayı görüntüle @
8f38b9e1
...
@@ -137,7 +137,6 @@ private:
...
@@ -137,7 +137,6 @@ private:
RenderEventType
maRenderEvent
;
RenderEventType
maRenderEvent
;
sal_uInt32
mSelectBarId
;
sal_uInt32
mSelectBarId
;
Point
maClickPos
;
Point
maClickPos
;
OUString
mTestString
;
sal_uInt32
miScrollRate
;
sal_uInt32
miScrollRate
;
bool
mbScrollFlg
;
bool
mbScrollFlg
;
};
};
...
...
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