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
731f3d98
Kaydet (Commit)
731f3d98
authored
Agu 04, 2013
tarafından
Siqi LIU
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
request immdiateupdate for pointerSymbol, but bad performance
Change-Id: I943019f6f6c6aaddeb40bf7f56bd0ffefff8a6b3
üst
dffc87dd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
12 deletions
+40
-12
Receiver.cxx
sd/source/ui/remotecontrol/Receiver.cxx
+28
-6
pointersymbol.cxx
slideshow/source/engine/pointersymbol.cxx
+11
-5
slideshowimpl.cxx
slideshow/source/engine/slideshowimpl.cxx
+1
-1
No files found.
sd/source/ui/remotecontrol/Receiver.cxx
Dosyayı görüntüle @
731f3d98
...
@@ -132,11 +132,32 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
...
@@ -132,11 +132,32 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
}
}
else
if
(
aCommand
[
0
].
equals
(
"pointer_started"
))
else
if
(
aCommand
[
0
].
equals
(
"pointer_started"
))
{
{
std
::
cerr
<<
"pointer_started"
<<
std
::
endl
;
// std::cerr << "pointer_started" << std::endl;
float
x
=
aCommand
[
1
].
toFloat
();
float
y
=
aCommand
[
2
].
toFloat
();
SolarMutexGuard
aSolarGuard
;
SolarMutexGuard
aSolarGuard
;
const
::
com
::
sun
::
star
::
geometry
::
RealPoint2D
pos
(
x
,
y
);
// std::cerr << "Pointer at ("<<pos.X<<","<<pos.Y<<")" << std::endl;
if
(
xSlideShow
.
is
())
try
{
// std::cerr << "pointer_coordination in the is" << std::endl;
xSlideShow
->
setProperty
(
beans
::
PropertyValue
(
"PointerPosition"
,
-
1
,
makeAny
(
pos
),
beans
::
PropertyState_DIRECT_VALUE
)
);
}
catch
(
Exception
&
)
{
SAL_WARN
(
"sd.slideshow"
,
"sd::SlideShowImpl::setPointerPosition(), "
"exception caught: "
<<
comphelper
::
anyToString
(
cppu
::
getCaughtException
()
));
}
if
(
xSlideShow
.
is
())
try
if
(
xSlideShow
.
is
())
try
{
{
std
::
cerr
<<
"pointer_started in the is"
<<
std
::
endl
;
//
std::cerr << "pointer_started in the is" << std::endl;
xSlideShow
->
setProperty
(
xSlideShow
->
setProperty
(
beans
::
PropertyValue
(
"PointerVisible"
,
beans
::
PropertyValue
(
"PointerVisible"
,
-
1
,
-
1
,
...
@@ -148,15 +169,16 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
...
@@ -148,15 +169,16 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
SAL_WARN
(
"sd.slideshow"
,
"sd::SlideShowImpl::setPointerMode(), "
SAL_WARN
(
"sd.slideshow"
,
"sd::SlideShowImpl::setPointerMode(), "
"exception caught: "
<<
comphelper
::
anyToString
(
cppu
::
getCaughtException
()
));
"exception caught: "
<<
comphelper
::
anyToString
(
cppu
::
getCaughtException
()
));
}
}
SAL_INFO
(
"sdremote"
,
"Pointer started, we display the pointer on screen"
);
SAL_INFO
(
"sdremote"
,
"Pointer started, we display the pointer on screen"
);
}
}
else
if
(
aCommand
[
0
].
equals
(
"pointer_dismissed"
))
else
if
(
aCommand
[
0
].
equals
(
"pointer_dismissed"
))
{
{
std
::
cerr
<<
"pointer_dismissed"
<<
std
::
endl
;
//
std::cerr << "pointer_dismissed" << std::endl;
SolarMutexGuard
aSolarGuard
;
SolarMutexGuard
aSolarGuard
;
if
(
xSlideShow
.
is
())
try
if
(
xSlideShow
.
is
())
try
{
{
std
::
cerr
<<
"pointer_dismissed in the is"
<<
std
::
endl
;
//
std::cerr << "pointer_dismissed in the is" << std::endl;
xSlideShow
->
setProperty
(
xSlideShow
->
setProperty
(
beans
::
PropertyValue
(
"PointerVisible"
,
beans
::
PropertyValue
(
"PointerVisible"
,
-
1
,
-
1
,
...
@@ -178,12 +200,12 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
...
@@ -178,12 +200,12 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
SAL_INFO
(
"sdremote"
,
"Pointer at ("
<<
x
<<
","
<<
y
<<
")"
);
SAL_INFO
(
"sdremote"
,
"Pointer at ("
<<
x
<<
","
<<
y
<<
")"
);
const
::
com
::
sun
::
star
::
geometry
::
RealPoint2D
pos
(
x
,
y
);
const
::
com
::
sun
::
star
::
geometry
::
RealPoint2D
pos
(
x
,
y
);
std
::
cerr
<<
"Pointer at ("
<<
pos
.
X
<<
","
<<
pos
.
Y
<<
")"
<<
std
::
endl
;
//
std::cerr << "Pointer at ("<<pos.X<<","<<pos.Y<<")" << std::endl;
SolarMutexGuard
aSolarGuard
;
SolarMutexGuard
aSolarGuard
;
if
(
xSlideShow
.
is
())
try
if
(
xSlideShow
.
is
())
try
{
{
std
::
cerr
<<
"pointer_coordination in the is"
<<
std
::
endl
;
//
std::cerr << "pointer_coordination in the is" << std::endl;
xSlideShow
->
setProperty
(
xSlideShow
->
setProperty
(
beans
::
PropertyValue
(
"PointerPosition"
,
beans
::
PropertyValue
(
"PointerPosition"
,
-
1
,
-
1
,
...
...
slideshow/source/engine/pointersymbol.cxx
Dosyayı görüntüle @
731f3d98
...
@@ -119,11 +119,15 @@ basegfx::B2DPoint PointerSymbol::calcSpritePos(
...
@@ -119,11 +119,15 @@ basegfx::B2DPoint PointerSymbol::calcSpritePos(
const
uno
::
Reference
<
rendering
::
XBitmap
>
xBitmap
(
rView
->
getCanvas
()
->
getUNOCanvas
(),
const
uno
::
Reference
<
rendering
::
XBitmap
>
xBitmap
(
rView
->
getCanvas
()
->
getUNOCanvas
(),
uno
::
UNO_QUERY_THROW
);
uno
::
UNO_QUERY_THROW
);
const
geometry
::
IntegerSize2D
realSize
(
xBitmap
->
getSize
()
);
const
geometry
::
IntegerSize2D
realSize
(
xBitmap
->
getSize
()
);
return
basegfx
::
B2DPoint
(
basegfx
::
B2DPoint
newPos
(
// pos.X pos.Y are given in 0..1, beginning from the upper left corner of the currentSlide.
// pos.X pos.Y are given in 0..1, beginning from the upper left corner of the currentSlide.
std
::
min
<
sal_Int32
>
(
realSize
.
Width
*
pos
.
X
,
LEFT_BORDER_SPACE
),
realSize
.
Width
*
pos
.
X
,
std
::
max
<
sal_Int32
>
(
0
,
realSize
.
Height
*
(
1
-
pos
.
Y
)
-
mxBitmap
->
getSize
().
Height
realSize
.
Height
*
pos
.
Y
);
-
LOWER_BORDER_SPACE
)
);
// std::cerr << "calcSpritePos : (" << newPos.getX() << ","<<newPos.getY() << ")" << std::endl;
return
newPos
;
}
}
void
PointerSymbol
::
viewAdded
(
const
UnoViewSharedPtr
&
rView
)
void
PointerSymbol
::
viewAdded
(
const
UnoViewSharedPtr
&
rView
)
...
@@ -215,9 +219,11 @@ void PointerSymbol::viewsChanged(const ::com::sun::star::geometry::RealPoint2D p
...
@@ -215,9 +219,11 @@ void PointerSymbol::viewsChanged(const ::com::sun::star::geometry::RealPoint2D p
ViewsVecT
::
const_iterator
const
aEnd
(
maViews
.
end
()
);
ViewsVecT
::
const_iterator
const
aEnd
(
maViews
.
end
()
);
while
(
aIter
!=
aEnd
)
while
(
aIter
!=
aEnd
)
{
{
if
(
aIter
->
second
)
if
(
aIter
->
second
)
{
aIter
->
second
->
movePixel
(
aIter
->
second
->
movePixel
(
calcSpritePos
(
aIter
->
first
,
pos
));
calcSpritePos
(
aIter
->
first
,
pos
));
mrScreenUpdater
.
requestImmediateUpdate
();
}
++
aIter
;
++
aIter
;
}
}
}
}
...
...
slideshow/source/engine/slideshowimpl.cxx
Dosyayı görüntüle @
731f3d98
...
@@ -1809,7 +1809,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
...
@@ -1809,7 +1809,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
if
(
!
(
rProperty
.
Value
>>=
pos
))
if
(
!
(
rProperty
.
Value
>>=
pos
))
return
false
;
return
false
;
std
::
cerr
<<
"Received pos at :("
<<
pos
.
X
<<
","
<<
pos
.
Y
<<
")"
<<
std
::
endl
;
//
std::cerr<<"Received pos at :(" << pos.X << ","<<pos.Y << ")" << std::endl;
mpPointerSymbol
->
viewsChanged
(
pos
);
mpPointerSymbol
->
viewsChanged
(
pos
);
}
}
...
...
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