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
ccbaca29
Kaydet (Commit)
ccbaca29
authored
Ock 14, 2014
tarafından
Markus Mohrhard
Kaydeden (comit)
Markus Mohrhard
Ock 29, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
first fixes for rectangle rendering
Change-Id: I7705f8fd0472ad482d2292438d264eb0b641758e
üst
988e70bc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
5 deletions
+22
-5
DummyXShape.cxx
chart2/source/view/main/DummyXShape.cxx
+19
-3
OpenGLRender.cxx
chart2/source/view/main/OpenGLRender.cxx
+2
-2
OpenglShapeFactory.cxx
chart2/source/view/main/OpenglShapeFactory.cxx
+1
-0
No files found.
chart2/source/view/main/DummyXShape.cxx
Dosyayı görüntüle @
ccbaca29
...
...
@@ -562,11 +562,28 @@ DummyRectangle::DummyRectangle(const awt::Size& rSize, const awt::Point& rPoint,
void
DummyRectangle
::
render
()
{
/*
SAL_WARN
(
"chart2.opengl"
,
"render DummyRectangle"
);
debugProperties
(
maProperties
);
DummyChart
*
pChart
=
getRootShape
();
std::map< OUString, uno::Any >::const_iterator itr = maProperties.find("FillColor");
std
::
map
<
OUString
,
uno
::
Any
>::
const_iterator
itr
=
maProperties
.
find
(
"Invisible"
);
if
(
itr
!=
maProperties
.
end
())
{
SAL_WARN
(
"chart2.opengl"
,
"invisble"
);
return
;
}
itr
=
maProperties
.
find
(
"FillStyle"
);
if
(
itr
!=
maProperties
.
end
())
{
drawing
::
FillStyle
eStyle
=
itr
->
second
.
get
<
drawing
::
FillStyle
>
();
if
(
eStyle
==
drawing
::
FillStyle_NONE
)
{
SAL_WARN
(
"chart2.opengl"
,
"no fill style"
);
return
;
}
}
itr
=
maProperties
.
find
(
"FillColor"
);
if
(
itr
!=
maProperties
.
end
())
{
uno
::
Any
co
=
itr
->
second
;
...
...
@@ -587,7 +604,6 @@ void DummyRectangle::render()
}
pChart
->
m_GLRender
.
RectangleShapePoint
(
maPosition
.
X
,
maPosition
.
Y
,
maSize
.
Width
,
maSize
.
Height
);
pChart
->
m_GLRender
.
RenderRectangleShape
();
*/
}
DummyText
::
DummyText
(
const
OUString
&
rText
,
const
tNameSequence
&
rNames
,
...
...
chart2/source/view/main/OpenGLRender.cxx
Dosyayı görüntüle @
ccbaca29
...
...
@@ -1612,8 +1612,8 @@ int OpenGLRender::SetArea2DShapePoint(float x, float y, int listLength)
{
m_Area2DPointList
.
reserve
(
listLength
);
}
float
actualX
=
(
x
/
OPENGL_SCALE_VALUE
)
-
((
float
)
m_iWidth
/
2
)
;
float
actualY
=
(
y
/
OPENGL_SCALE_VALUE
)
-
((
float
)
m_iHeight
/
2
)
;
float
actualX
=
(
x
/
OPENGL_SCALE_VALUE
);
float
actualY
=
(
y
/
OPENGL_SCALE_VALUE
);
m_Area2DPointList
.
push_back
(
actualX
);
m_Area2DPointList
.
push_back
(
actualY
);
m_Area2DPointList
.
push_back
(
m_fZStep
);
...
...
chart2/source/view/main/OpenglShapeFactory.cxx
Dosyayı görüntüle @
ccbaca29
...
...
@@ -368,6 +368,7 @@ uno::Reference< drawing::XShape > OpenglShapeFactory::createInvisibleRectangle(
,
const
awt
::
Size
&
rSize
)
{
dummy
::
DummyRectangle
*
pRectangle
=
new
dummy
::
DummyRectangle
(
rSize
);
pRectangle
->
setPropertyValue
(
"Invisible"
,
uno
::
makeAny
(
sal_True
));
xTarget
->
add
(
pRectangle
);
return
pRectangle
;
}
...
...
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